bower updated with angular
bower updated with angular
Merge branch 'master' of github.com:yichenzhu1337/my_esports_world

Conflicts:
	app/routes.php
	app/views/index.php
	public/app/app.js
merge conflict