Merge branch 'master' of github.com:mandyyeung/parascope into mandy
Merge branch 'master' of github.com:mandyyeung/parascope into mandy
Merge branch 'master' of github.com:mandyyeung/parascope into mandy
Merge branch 'master' of github.com:mandyyeung/parascope into mandy
Merge branch 'master' of github.com:mandyyeung/parascope into mandy
added authentication to collections and articles controllers
Merge pull request #13 from SyntaxChris/master

added upvote and downvote to article
Merge branch 'master' of github.com:mandyyeung/parascope into mandy
errors
errors
Merge pull request #14 from FrantzLacarriere/Frantz

Frantz
Merge branch 'master' of github.com:mandyyeung/parascope into mandy
defualted priority to 0 and archive to false
Merge pull request #15 from mendyismyname/master

defualted priority to 0 and archive to false
removed merge conflict line
Merge branch 'master' of github.com:mandyyeung/parascope into mandy
Merge branch 'master' of github.com:mandyyeung/parascope
fixed validations and added better errors gem
Merge pull request #16 from mendyismyname/master

fixed validations and added better errors gem
update