Initial Commit
Resolved Merge Conflict in routes.rb