Merge pull request #52 from LasseSviland/master

finished javascript to fade between pages
added line to gemfile for heroku
reset gemfile.lock
Updated js for homepage
Merge pull request #53 from LasseSviland/master

added gemfile
Removed gemfile.lock from gitingnore file, and adding gemfile.lock
Merge branch 'master' of https://github.com/cicadas-2014/Embark

Conflicts:
	Gemfile.lock
removed 2 adventures from csv
Added debugging for heroku
removed debugging for heroku
Merge pull request #55 from LasseSviland/master

removed 2 adventures from csv
Added debugging for heroku
Merge pull request #56 from LasseSviland/master

Added debugging for heroku
Updated debugging for heroku
updated debugging for heroku
Merge pull request #57 from LasseSviland/master

Updated debugging for heroku
removed 2 adventures that is returning city id 0
Merge pull request #58 from LasseSviland/master

removed 2 adventures that is returning city id 0
removed debugging for heroku
Merge pull request #59 from LasseSviland/master

removed debugging for heroku