Merge branch 'master' of github.com:siliconocean/siliconocean
style
style
style
Merge branch 'master' of github.com:siliconocean/siliconocean

Conflicts:
	views/slides/project.jade