Silly main.js
Merge branch 'master' of https://github.com/DennisBuijs/Questionmark

Conflicts:
	public/js/main.js