exclude Komodo files using .gitignore
changed .gitignore
added angular app
Merge branch 'develop' of https://github.com/Feld0/CityData into develop
refined city router
plug service to stub
view and controller to match stub
Merge branch 'feature/Frontend' into develop
renamed city from routing
city data went through.
Ignored IntelliJ files.
Merge branch 'feature/Frontend' into feature/Laravelize_Angular
Merge branch 'master' into feature/Laravelize_Angular

Conflicts:
	.gitignore
Laravelized!
Merge branch 'feature/Laravelize_Angular' into develop