Fixing Mergers
Merge branch 'master' of github.com:Bacon41/Unreached-Data-Gathering
Merge branch 'master' of github.com:Bacon41/Unreached-Data-Gathering
Deleted some comments from the MainActivity.java file
Fixed the merge

Merge branch 'master' of github.com:Bacon41/Unreached-Data-Gathering

Conflicts:
	src/org/unreacheddatagathering/MainActivity.java
Started including stuff for getting the GPS coordinates
Messy version with latitude and longitude
Merged versions with working buttons until it gets to the form, and gps detection.

Merge branch 'master' of github.com:Bacon41/Unreached-Data-Gathering

Conflicts:
	AndroidManifest.xml
	src/org/unreacheddatagathering/MainActivity.java
Have added form entry data which will respond to the date and GPS coordinates that the picture stores
Made a few small changes for the date format
Merged the two versions to include sending e-mails and the start of the form

Merge branch 'master' of github.com:Bacon41/Unreached-Data-Gathering

Conflicts:
	res/layout/activity_submit.xml
	res/values/styles.xml
	src/org/unreacheddatagathering/MainActivity.java