Change to  Ruby 1.9 style hash
Made routes in Rails convention way and refactored tests
Finished layout and routes