Merge branch 'master' into develop
Updated partnership proposition, changed .explore icon animation, added new tickets block, merged js plugins into one file, refactoring of scripts.js, minor style fixes
Merge branch 'develop' into gh-pages
Added sitemap, fixed animation bug
Fixed twitter link
Merge branch 'develop'
Updated scripts
Merge branch 'gh-pages'

Conflicts:
	js/scripts.js
	js/scripts.min.js
Updated scripts. Sorry
Updated scripts
Fixes ribbon link on speakers modal
Merge pull request #13 from erickmendonca/develop

Fixes ribbon link on speakers modal
Hackathon page basic structure
Updated hackathon page
Update README.md
Finished hackathon page, fixed some issues
Static map on small screens, ability to change background image/color of top-section, finalised hackathon page
Moved static map fallback to scripts.js
Merge branch 'develop'. Project Zeppelin v0.4
typo in README

fixing name of GDG chapter name