more style changes
Merge branch 'master' of https://github.com/annynew/fitness_dev
styles