stuff
Merge branch 'master' of https://github.com/JoePelz/studyStorm

Conflicts:
	index.html