better stuff
Merge branch 'master' of https://github.com/domfarolino/gitTest

Conflicts:
	index.html