latest commit
final commit
ada
Merge branch 'b_gps' of github.com:veriqual/Masjid-app into volleybranch
final merge
Merge branch 'b_gps' of github.com:veriqual/Masjid-app into volleybranch
error in merging

Conflicts:
	VolleyWrapper/res/layout/custom_info_window.xml
	VolleyWrapper/src/com/example/volleywrapper/DetailTimings.java
	VolleyWrapper/src/com/example/volleywrapper/MainActivity.java