working on homepage
Merge branch 'master' of https://github.com/swestwood/cs247-final
Updated homepage tutorial
Merge branch 'master' of https://github.com/swestwood/cs247-final

Conflicts:
	dashboard/index.html