Initial import
Merge branch 'master' of github.com:KNEIP/activity_maps

Conflicts:
	.gitignore
	README.md
Update README.md file