Merge branch 'master' of https://github.com/bombinmybag/enter-site

Conflicts:
	js/main.js
Merge remote-tracking branch 'origin/master'