adding true to scrollwheel
Merge branch 'master' of https://github.com/prschulz/project_awesome
merge to upstream
added models, relationships, and migrations
fixing relationships and renaming join tables
conflict fixed