adding search button
adding more styling
got basic template up and running
Merge branch 'master' of github.com:stomatocode/GoThere into expedia
cleaned up shit
Merge pull request #5 from stomatocode/home-page-design

Home page design
commit to resolve merge conflicts
fix conflict in index.html.erb