Copyright info
Merge branch 'master' of https://github.com/Crumbtray/CMPUT404-assignment-ajax

Conflicts:
	static/index.html