Merge pull request #13 from pasharayan/master

Pull
cancan for articles
swiftype
changed gemfile lock