Added temporary Help and About pages
Repair merge conflict route.rb
Delete routes.rb.orig after merge