Okey..
Merge branch 'master' of https://github.com/pascalwilbrink/proof-of-concept

Conflicts:
	poc/db/schema.rb