assets folder
???
Merge branch 'master' of https://github.com/meidlin/LivingRoom
added rspec gems