Initial Commit
First commit. Adding a README.
Second commit. Checking to make sure commits are up to date with current progress
Merge branch 'master' of https://github.com/DavindraS/Whereami

Conflicts:
	README.md