Merge branch 'master' of https://github.com/cicadas-2014/Embark

Conflicts:
	Gemfile.lock
Merge pull request #55 from LasseSviland/master

removed 2 adventures from csv
Merge pull request #56 from LasseSviland/master

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

Updated debugging for heroku
Merge pull request #58 from LasseSviland/master

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

removed debugging for heroku
Merge pull request #60 from LasseSviland/master

added debug to see if heroku is actualy connected to the right git
Fixed spelling errors on front page
Merge pull request #62 from JessicaTatham/master

Fixed spelling errors on front page
Merge pull request #61 from LasseSviland/master

Removed debugging for heroku
Merge pull request #64 from LasseSviland/master

removed adventure with city id 2014
Changed local picture duplicate
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Merge pull request #65 from JessicaTatham/master

Changed duplicate local image
updated css for first page