bower.json
Merge branch 'master' of https://github.com/r8chel/aqualitylife

Conflicts:
	bower.json