changed readme file for test
Merge branch 'master' of https://github.com/mbetts7/Grokkie
Merge branch 'master' of https://github.com/mbetts7/Grokkie
updating index page view & css
updating index css
basic index frame laid out
resolved some conflicts
fixed gemfile.lock
fixed gemfile
merge and rebase on feature
added image attachment to categories model
image upload working on roadmaps
;
fixed merge conflicts