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

Conflicts:
	.gitignore
	poc/tmp/cache/assets/development/sprockets/88d619ecb1068dbdbe8eba7c0056e44c
	poc/tmp/cache/assets/development/sprockets/f81ef22356076e422f5227369b10fa60
	poc/tmp/cache/assets/development/sprockets/fa6b53e34e4abad5deba3f8a4b016f50