projects in home
Merge branch 'master' of github.com:siliconocean/siliconocean

Conflicts:
	app.js