removed merge conflict line
Merge branch 'master' of github.com:mandyyeung/parascope
update
Merge branch 'master' of github.com:mandyyeung/parascope
deleted ds store
Merge branch 'master' of github.com:mandyyeung/parascope
Merge pull request #24 from mandyyeung/mandy

Added restore button to undo archive
Merge branch 'master' of github.com:mandyyeung/parascope
fixed collection show page
implemented slug
Merge pull request #25 from SyntaxChris/master

Implemented slug with friendly_id gem
slide out bar and boxes
gitignore
Merge branch 'master' of github.com:mandyyeung/parascope
Merge pull request #26 from mendyismyname/master

slide out bar and some styling on the boxes
js page change fix
Merge pull request #27 from mendyismyname/master

slide out bar and some styling on the boxes
Updated new article page to show selections in the unsorted collection; added gem to enable the RailsPanel Chrome extension