did some bad-asssss shit

adasda
Merge branch 'master' of https://github.com/darioml/soh-get-stuff-done

Conflicts:
	rails-backend/public/partials/create_project.html