twitter secret
Merge branch 'master' of github.com:siliconocean/siliconocean
Merge branch 'master' of github.com:siliconocean/siliconocean
project creation
Merge branch 'master' of github.com:siliconocean/siliconocean

Conflicts:
	app.js
	controllers/project.js