sublime text preferences
Merge branch 'gh-pages' of https://github.com/Jonearley/map into gh-pages

Conflicts:
	js/scripts.js