added bower to requirements
Merge branch 'master' of github.com:xen/flask-project-template

Conflicts:
	README.md
merge