We added the show page
Merge pull request #5 from FrantzLacarriere/master

We added the show page
Merge branch 'master' of github.com:mandyyeung/parascope into mandy
Merge pull request #6 from mandyyeung/mandy

Articles-collections associations corrected on the new article form
added archive
fixed merge conflict
Merge pull request #7 from mendyismyname/master

fixed merge conflict
Merge branch 'master' of github.com:mandyyeung/parascope into mandy
removed nested users. fixed archive buttons
Merge pull request #8 from mendyismyname/master

removed nested users. fixed archive buttons
Merge branch 'master' of github.com:mandyyeung/parascope into mandy
fixed last reminance of users in url
Merge pull request #9 from mendyismyname/master

fixed last reminance of users in url
Merge branch 'master' of github.com:mandyyeung/parascope into mandy
a bunch of fixes in user model and stuff
Merge pull request #10 from mendyismyname/master

fixed last reminance of users in url
Merge branch 'master' of github.com:mandyyeung/parascope into mandy
added authentications to article and collection controller
added authentication to collections and articles controllers
added upvote and downvotes to collecitons