1111
Merge branch 'master' of https://github.com/catskay/yoga

Conflicts:
	app/controllers/HomeController.php
	app/views/selection2.blade.php
	app/views/selector.blade.php