Initial commit of rails app
Merges rack app
Fixes gemfile conflict
Moves things for Rails vs Rack setup