added category icons to random roadmap divs
add skill and category to roadmap show
added category icon url to seed data
deleted unnecessary migration file
fixed merge conflicts
merged conflicts
updated to origin master
merging conflicts
adding schema update from ashleys
merged with master