in progress
Merge branch 'master' of https://github.com/eyedraw/Woobify

Conflicts:
	laravel/app/controllers/CreationController.php