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

Conflicts:
	poc/app/assets/javascripts/application.js
	poc/app/assets/stylesheets/application.css.scss
	poc/config/routes.rb
	poc/db/schema.rb
	poc/db/seeds.rb