Fix Loading
Merge branch 'master' of https://github.com/uodyne/angular-basic

Conflicts:
	app/index.html