Working but plain individua activity page
Merge branch 'front-end' of https://github.com/kelleystephens/dating into front-end
merge to fix json
Merge branch 'front-end' of https://github.com/kelleystephens/dating into front-end
fixing merge conflicts
color options
css stuff