Merge remote-tracking branch 'origin/ChrisFork'
test
Merge branch 'ChrisFork' into Alex-RhodyGuide
Merge branch 'master' into Alex-RhodyGuide
Merge branch 'ChrisFork' into Alex-RhodyGuide
Toyed with Server and Directions
Merge remote-tracking branch 'origin/GerardsBranch' into Alex-RhodyGuide

Conflicts:
	bin/R.txt
	bin/RhodyGuide.apk
	bin/classes.dex
	bin/classes/com/example/rhodyguide/EditScheduleFragment$2.class
	bin/classes/com/example/rhodyguide/EditScheduleFragment.class
	bin/classes/com/example/rhodyguide/FragmentMap$1.class
	bin/classes/com/example/rhodyguide/FragmentMap$2.class
	bin/classes/com/example/rhodyguide/FragmentMap$3.class
	bin/classes/com/example/rhodyguide/FragmentMap$4.class
	bin/classes/com/example/rhodyguide/FragmentMap$OverscrollHandler.class
	bin/classes/com/example/rhodyguide/FragmentMap.class
	bin/classes/com/example/rhodyguide/Login$1.class
	bin/classes/com/example/rhodyguide/Login$2.class
	bin/classes/com/example/rhodyguide/Login$3.class
	bin/classes/com/example/rhodyguide/Login.class
	bin/classes/com/example/rhodyguide/MapActivity.class
	bin/classes/com/example/rhodyguide/NavDrawerListAdapter.class
	bin/classes/com/example/rhodyguide/R$id.class
	bin/classes/com/example/rhodyguide/R$integer.class
	bin/classes/com/example/rhodyguide/R$menu.class
	bin/classes/com/example/rhodyguide/R$string.class
	bin/classes/com/example/rhodyguide/R$style.class
	bin/classes/com/example/rhodyguide/R$styleable.class
	bin/resources.ap_
	gen/com/example/rhodyguide/R.java
	project.properties
	src/com/example/rhodyguide/FragmentMap.java
	src/com/example/rhodyguide/Login.java
Register User is working

Fixed Register User, fixed button-method references in layout xml files.
Merge pull request #1 from abouthillier/Alex-RhodyGuide

Alex rhody guide