Location play

ayy
yeah

just dont tip me
Merge remote-tracking branch 'origin/master'

Conflicts:
	CheckIn/CheckIn/CheckIn.userprefs
	CheckIn/CheckIn/SignIn.cs
	CheckIn/CheckIn/StudentPage.cs
	CheckIn/CheckIn/bin/Debug/CheckIn.CheckIn-Signed.apk
	CheckIn/CheckIn/bin/Debug/CheckIn.CheckIn.apk
	CheckIn/CheckIn/bin/Debug/CheckIn.dll
	CheckIn/CheckIn/bin/Debug/CheckIn.dll.mdb
	CheckIn/CheckIn/bin/Debug/CheckIn.pdb
	CheckIn/CheckIn/obj/Debug/CheckIn.dll
	CheckIn/CheckIn/obj/Debug/CheckIn.pdb
	CheckIn/CheckIn/obj/Debug/android/bin/CheckIn.CheckIn.apk
	CheckIn/CheckIn/obj/Debug/android/bin/classes.dex

	CheckIn/CheckIn/obj/Debug/android/bin/classes/checkin/checkin/R$id.class

	CheckIn/CheckIn/obj/Debug/android/bin/classes/checkin/checkin/R$layout.class

	CheckIn/CheckIn/obj/Debug/android/bin/classes/checkin/checkin/R$string.class

	CheckIn/CheckIn/obj/Debug/android/bin/classes/checkin/checkin/R$style.class
	CheckIn/CheckIn/obj/Debug/android/bin/classes/checkin/checkin/R.class
	CheckIn/CheckIn/obj/Debug/android/bin/packaged_resources
	CheckIn/CheckIn/obj/Debug/android/bin/resources_and_assemblies
	CheckIn/CheckIn/obj/Debug/android/checkin/checkin/R.java
	CheckIn/CheckIn/obj/Debug/android/src/checkin/checkin/R.java
	CheckIn/CheckIn/obj/Debug/assemblies/CheckIn.dll
	CheckIn/CheckIn/obj/Debug/assemblies/CheckIn.dll.mdb
	CheckIn/CheckIn/obj/Debug/resolved_assemblies.txt
suck my dic // choke on it

Conflicts:
	CheckIn/CheckIn/Resources/Resource.designer.cs
	CheckIn/CheckIn/bin/Debug/CheckIn.dll
	CheckIn/CheckIn/bin/Debug/CheckIn.dll.mdb
	CheckIn/CheckIn/bin/Debug/CheckIn.pdb
	CheckIn/CheckIn/obj/Debug/CheckIn.csproj.FileListAbsolute.txt
	CheckIn/CheckIn/obj/Debug/CheckIn.dll
	CheckIn/CheckIn/obj/Debug/CheckIn.pdb
	CheckIn/CheckIn/obj/Debug/android/bin/classes.dex

	CheckIn/CheckIn/obj/Debug/android/bin/classes/checkin/checkin/R$id.class

	CheckIn/CheckIn/obj/Debug/android/bin/classes/checkin/checkin/R$layout.class

	CheckIn/CheckIn/obj/Debug/android/bin/classes/checkin/checkin/R$string.class

	CheckIn/CheckIn/obj/Debug/android/bin/classes/checkin/checkin/R$style.class
	CheckIn/CheckIn/obj/Debug/android/bin/classes/checkin/checkin/R.class
	CheckIn/CheckIn/obj/Debug/android/bin/packaged_resources
	CheckIn/CheckIn/obj/Debug/android/checkin/checkin/R.java
	CheckIn/CheckIn/obj/Debug/android/src/checkin/checkin/R.java
	CheckIn/CheckIn/obj/Debug/assemblies/CheckIn.dll
	CheckIn/CheckIn/obj/Debug/assemblies/CheckIn.dll.mdb
	CheckIn/CheckIn/obj/Debug/resolved_assemblies.txt