Merge branch 'master' of https://github.com/khurrumqureshi/BigHead

Conflicts:
	main.js