Merge branch 'master' of https://github.com/mbetts7/Grokkie
making adjustments to resource show page
switched skill and category on roadmap show page
used resource.name instead of resource.description
Merge pull request #48 from mbetts7/resources

Resources
merged with master