first commit
Merge branch 'master' of https://github.com/jashrand/CodeSample

Conflicts:
	README.md
Adding map client code