Merge branch 'master' of github.com:keydunov/breath

Conflicts:
	app/assets/stylesheets/styles.css
Merge branch 'master' of github.com:keydunov/breath