gh-pages grunt fixed
gh-pages fixed
Merge branch 'master' of https://github.com/stakisko/elmap.js

Conflicts:
	Gruntfile.js