Location
Add You Are Here marker and location class
Merge branch 'master' of https://github.com/dbousamra/android-hackathon

Conflicts:
	src/com/example/androidhackathon/AndroidHackathonActivity.java
Merge
Merge branch 'master' of https://github.com/dbousamra/android-hackathon

Conflicts:
	src/com/example/androidhackathon/AndroidHackathonActivity.java