meidlin/LivingRoom — pull request #13 by soutchay (2014-12-01 22:44:22+00:00)
Title: Soutchay

merge soutchay branch with master