bower stuff
Merge branch 'master' of https://github.com/cme3888/NewSite

Conflicts:
	.gitignore
	Gruntfile.js
	app/images/momcancer.jpg
	app/index.html
	app/scripts/main.js
	bower.json
	package.json