style
Merge branch 'master' of github.com:monotv/myfit-demo

Conflicts:
	css/styles.css