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

Conflicts:
	poc/app/views/messages/index.html.erb
Merge branch 'master' of https://github.com/pascalwilbrink/proof-of-concept