Added unknown estimote code
Merge branch 'Game'

Conflicts:
	DrU.v12.suo
	DrU/obj/iPhone/Release/DesignTimeResolveAssemblyReferencesInput.cache
Revert "Added unknown estimote code"

This reverts commit 7502a0174a095bab46b75fcc8281a45cb1e9a6ad.
Revert "Added unknown estimote code"

This reverts commit 7502a0174a095bab46b75fcc8281a45cb1e9a6ad.
Revert "Revert "Added unknown estimote code""

This reverts commit f02457d423338298a6dfe2aa0f6f6b58c26d2967.
Revert "Revert "Added unknown estimote code""

This reverts commit 542413f657e656d6219af90ac74531150caa1faf.
Merge branch 'GUI'
Merge remote-tracking branch 'origin/master' into estimote
Added new estimote page

Added estimote page that adds nearby estimotes to a table and creates
and reads from a file
Changed Button that accesses estimote page

Changed the button that triggers the new estimote page and fixed the
error that was causing the ranging text to freeze up
Merge remote-tracking branch 'origin/estimote'
Merge remote-tracking branch 'origin/GUI'

Conflicts:
	DrU.v12.suo
	DrU/DrU.csproj
	DrU/Resources/mainbackground.jpg
	DrU/bin/iPhone/Debug/System.Core.dll
	DrU/bin/iPhone/Debug/System.Core.dll.mdb
	DrU/bin/iPhone/Debug/System.Xml.dll
	DrU/bin/iPhone/Debug/System.Xml.dll.mdb
	DrU/bin/iPhone/Debug/System.dll
	DrU/bin/iPhone/Debug/System.dll.mdb
	DrU/bin/iPhone/Debug/monotouch.dll
	DrU/bin/iPhone/Debug/monotouch.dll.mdb
	DrU/bin/iPhone/Debug/mscorlib.dll
	DrU/bin/iPhone/Debug/mscorlib.dll.mdb

DrU/bin/iPhone/Release/DrU.app/MainStoryboard.storyboardc/UIViewControll
er-gZO-Wo-2ky.nib

DrU/bin/iPhone/Release/DrU.app/MainStoryboard.storyboardc/UIViewControll
er-j4b-9u-v2v.nib

DrU/bin/iPhone/Release/DrU.app/MainStoryboard.storyboardc/gZO-Wo-2ky-vie
w-OjZ-2O-TnF.nib

DrU/bin/iPhone/Release/DrU.app/MainStoryboard.storyboardc/j4b-9u-v2v-vie
w-lou-iP-NuY.nib
	DrU/bin/iPhone/Release/DrU.exe
	DrU/bin/iPhone/Release/DrU.exe.mdb
	DrU/bin/iPhoneSimulator/Debug/DrU.exe
	DrU/bin/iPhoneSimulator/Debug/DrU.exe.mdb
	DrU/bin/iPhoneSimulator/Debug/DrU.pdb

DrU/bin/iPhoneSimulator/Release/DrU.app/MainStoryboard.storyboardc/BYZ-3
8-t0r-view-8bC-Xf-vdC.nib

DrU/bin/iPhoneSimulator/Release/DrU.app/MainStoryboard.storyboardc/Info.
plist

DrU/bin/iPhoneSimulator/Release/DrU.app/MainStoryboard.storyboardc/UIVie
wController-BYZ-38-t0r.nib

DrU/bin/iPhoneSimulator/Release/DrU.app/MainStoryboard.storyboardc/UIVie
wController-gZO-Wo-2ky.nib

DrU/bin/iPhoneSimulator/Release/DrU.app/MainStoryboard.storyboardc/UIVie
wController-j4b-9u-v2v.nib

DrU/bin/iPhoneSimulator/Release/DrU.app/MainStoryboard.storyboardc/gZO-W
o-2ky-view-OjZ-2O-TnF.nib

DrU/bin/iPhoneSimulator/Release/DrU.app/MainStoryboard.storyboardc/j4b-9
u-v2v-view-lou-iP-NuY.nib
	DrU/bin/iPhoneSimulator/Release/DrU.exe
	DrU/bin/iPhoneSimulator/Release/DrU.exe.mdb
	DrU/obj/iPhoneSimulator/Debug/DrU.csproj.FileListAbsolute.txt
	DrU/obj/iPhoneSimulator/Debug/DrU.csprojResolveAssemblyReference.cache
	DrU/obj/iPhoneSimulator/Debug/DrU.exe
	DrU/obj/iPhoneSimulator/Debug/DrU.pdb

DrU/obj/iPhoneSimulator/Release/DesignTimeResolveAssemblyReferencesInput
.cache
Revert 3489a16..386dc0f

This rolls back to commit 3489a161e1698840c4bf2107d71dc9611613f581.
Added Git Ignore
Added git ignore
Revert 3489a16..288dbf5

This rolls back to commit 3489a161e1698840c4bf2107d71dc9611613f581.
Reverted to estomote -> master
Added gitattributes and updated gitIgnore
Updated Git Ignore and added tablecontroller code
Changed up Estimote page layout