messing around with css
changed to match toms
syncing css changes with tom
Merge branch 'master' of github.com:paullainchbury/cheerups
syncing with all
trying to sync up
Merging
Merge branch 'master' of github.com:paullainchbury/cheerups
Fixing CheerupsHelper
Preparing for merge