Initial
add angular seed
Merge pull request #1 from laravel/develop

Develop
Merge pull request #2 from laravel/develop

Develop
Merge pull request #3 from laravel/develop

Develop
update composer
Merge pull request #4 from laravel/develop

Develop
add services folder
Merge branch 'develop' of github.com:witooh/laravel-boilerplate into develop
cross domain + basic http auth
Merge branch 'develop'

Conflicts:
	app/views/hello.php