no message
Merge branch 'master' of https://github.com/pascalwilbrink/proof-of-concept
bla
Merge branch 'master' of https://github.com/pascalwilbrink/proof-of-concept

Conflicts:
	poc/app/views/dashboard/index.html.erb