updated to ruby 2.1.4
added pry as dev library
removed deprecation warning
updated gems
ruby 2.1.5
fix merge conflict
Merge branch 'master' of github.com:mikamai/lamernews into gi/post-in-linea