bower.json
bower
Merge branch 'master' of https://github.com/Pinusi/player-wellness
Merge branch 'master' of https://github.com/Pinusi/player-wellness

Conflicts:
	bower.json