Merge pull request #2 from jhulley/prelim_layout

Prelim layout
Merge pull request #3 from jhulley/prelim_layout

added js logic for showing and hiding doors and other details
Added gitignore
Updated Gemfile
Updated Gemfile
Added API call Wrapper to get three activities from FourSquare
Moved Foursqaure to Model from Assets
Merge pull request #4 from jhulley/prelim_layout

Prelim layout
merged master
Merge pull request #5 from jhulley/four_sqaure_api

Four sqaure api
Fixed the index route to not break everything
Fixed gemfile and added gemfile.lock to gitignore
Merge pull request #6 from jhulley/fixed_controller

Fixed the index route to not break everything
Update .gitignore
Merged master
Merge branch 'master' of https://github.com/jhulley/sundayadventure
merged master