Testing commit
Merge branch 'master' of https://github.com/vertex/TucsonAPI

Conflicts:
	laravel/app/config/app.php
	laravel/app/config/database.php
	laravel/app/routes.php
	laravel/app/views/hello.php
	laravel/artisan
	laravel/composer.json