app.php
Merge branch 'master' of github.com:mjdugan14/snappy

Conflicts:
	app/config/app.php