Merge pull request #46 from Rleahy22/users

Users preferences and article page
reimplemented source language detection
Merge pull request #47 from Rleahy22/article_show

reimplemented source language detection
Merge branch 'master' of https://github.com/Rleahy22/pilgrim into users
updated articles controller and user show page to view articles in only a certain language