changed stuff to stuffs
Merge branch 'master' of https://github.com/andrewrmack/Git_test

Conflicts:
	index.html