removed merge artifacts
Merge branch 'master' of https://github.com/JoePelz/studyStorm

Conflicts:
	js/queries.js