Merge branch 'master' of https://github.com/hassankbrian/HackGT

Conflicts:
	content.js