MSJCS/msjcs.github.io — pull request #6 by Inconditus (2014-04-24 05:06:59+00:00)
Title: Removes merge conflict

Next time, don't force push