initial files
added icons to map
Merge branch 'master' of https://github.com/rtmalone/world-traveler

Conflicts:
	app/static/js/user/vacations.js
	app/views/vacations/index.jade
	package.json