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 branch 'master' of github.com:mandyyeung/parascope
implemented slug
Merge pull request #25 from SyntaxChris/master

Implemented slug with friendly_id gem
Merge branch 'master' of github.com:mandyyeung/parascope