commiting gemfile.lock
updating master
fixed more css
removed paperclip stuff from roadmap show page
last commit
last commit
Merge branch 'more_css' of https://github.com/mbetts7/Grokkie into more_css
updating master
finishing merge