Just playing around with GitHub

Teehee
changed to mp site
commit github stuff
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	index.html
	styles.css