Merge branch 'master' of https://github.com/MSJCS/msjcs.github.io

Conflicts:
	about.html
	contact.html