Deploy
Deploy
Deploy
Merge branch 'gh-pages' of github.com:synodinos/FourFactory into gh-pages

Conflicts:
	js/app.js
	js/cf.js