Resolve conflict: Change gem from Jekyll to Github Pages; Update Octopress version
Resolve conflict: Change gem from Jekyll to Github Pages; Update Octopress version

jpangborn/jpangborn.github.io,jpangborn/jpangborn.github.io,jpangborn/jpangborn.github.io,jpangborn/jpangborn.github.io