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

Conflicts:
	.idea/workspace.xml
	app/views/summary.blade.php