Merge pull request #1 from mandyyeung/mendy

Updated forms
fixed the add links. Added add category
Merge pull request #2 from mendyismyname/master

fixed the add links. Added add category
added user controller model
Merge pull request #3 from mendyismyname/master

added user controller model
fixed link to succsess page for new catogory
Merge pull request #4 from mendyismyname/master

fixed link to succsess page for new catogory
We added the show page
Merge pull request #5 from FrantzLacarriere/master

We added the show page
Articles-collections associations corrected on the new form
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