stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/config/database.php
	app/views/selection2.blade.php
Merge branch 'master' of https://github.com/catskay/yoga

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