refactoring
Merge branch 'master' of github.com:patrickhulce/codiphy

Conflicts:
	static/scripts/display-detail.js
	static/scripts/display.js
	static/scripts/ui.js
	templates/project.html