Added Bower support.
Merge branch 'master' of github.com:RayPatterson/project-boilerplate

Conflicts:
	README.md
Update README.md