added route framework and basic controller logic. Controller logic is not complete
resolved merge confilcts in gemfile