ddasdasdasd
Merge branch 'b_gps' of github.com:veriqual/Masjid-app into b_gps
pulled b_gps

 Please enter a commit message to explain why this merge is necessary,
kasdjasidja
Merge branch 'b_gps' of github.com:veriqual/Masjid-app into b_gps
demo version

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