Heorku setup
Merge branch 'master' of https://github.com/gwake1/angular_addressBook

Conflicts:
	bower.json
	package.json