meidlin/LivingRoom — pull request #8 by soutchay (2014-11-22 01:51:13+00:00)
Title: Samantha

to merge your stuff with the master