#projects on the list
Merge branch 'master' of github.com:elpassion/elraising

Conflicts:
	app/views/templates/projects/index.html.slim