Merging and removing conflicts in the frontend branch with typeahead branch
Merging and removing conflicts in the frontend branch with typeahead branch

Conflicts:
	hackfmi/static/css/styles.css
	hackfmi/static/js/projectForm.js
	projects/templates/projects/add.html

Hackfmi/Diaphanum,Hackfmi/Diaphanum