facebook profile pic added
Merge branch 'master' of github.com:paullainchbury/cheerups
added cancan
added cancan stuff including guest ability
Fixing conflicts