test2
Merge branch 'master' of https://github.com/Hackathon-UCSC-2015/Practice-grade-project

Conflicts:
	index.html