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

Conflicts:
	app/views/edit.blade.php
	public/script