Finish front page
Merge branch 'master' of https://github.com/eolhing/beasavior

Conflicts:
	scripts/Main.js