bower
resolve
Merge branch 'master' of https://github.com/josulliv101/campusmap

Conflicts:
	.gitignore