updated javascript for fading between pages
Merge pull request #51 from JessicaTatham/master

Fixed positioning of third page
Merge branch 'master' of https://github.com/cicadas-2014/Embark
finished javascript to fade between pages
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
added gemfile
Merge pull request #53 from LasseSviland/master

added gemfile
Removed gemfile.lock from gitingnore file, and adding gemfile.lock
Removed gemfile.lock form gitignore(who have added it there?)
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