Cleaned up the project
Merge branch 'master' of https://github.com/7h0m4s/Primate

Conflicts:
	static/js/angular/controllers/mainController.js
	static/js/primate.js