psahni/status_update_app — pull request #3 by om-nishu-trantor (2014-04-30 10:06:21+00:00)
Title: fixed merged conflicts

Fixed conflicts in config/routes.rb master/login