Trying this again.
Merge branch 'master' of https://github.com/daynearron/Prevege

Conflicts:
	_assets/js/application-ck.js
	_assets/js/application.js
	build/application.sass
	build/index.haml
	css/application.css
	www/index.html