Changed First Lines of routes.rb and application.rb - Expecting Merge Conflict
Merge branch 'master' of https://github.com/ErikKierstead/nichtspass