Spectre
Merge branch 'master' of https://github.com/PeterVdK/JamesBond

Conflicts:
	www/css/customstyle.css
	www/index.html
	www/js/controllers.js