messed with css
Merge branches 'profile' and 'master'