not working edit w/ promise
Merge branch 'master' of github.com:siliconocean/siliconocean

Conflicts:
	controllers/project.js
	views/slides/project.jade