small changes
Merge branch 'master' of https://github.com/guywithnose/fuzzy-octo-bear

Conflicts:
	.DS_Store
	index.html
Merge remote-tracking branch 'jmate003/master'

Conflicts:
	index.html