Updated Spinner options, added onClick skeleton
Removing .gitignore.gitignore
removing NewProfActivity.java in lieu of NewProfessorActivity.java
Merge branch 'learninghowtogit'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/TestApp.apk
	bin/classes.dex
	bin/classes/com/example/testapp/MainActivity$DummySectionFragment.class
	bin/classes/com/example/testapp/MainActivity.class
	bin/classes/com/example/testapp/R$dimen.class
	bin/classes/com/example/testapp/R$drawable.class
	bin/classes/com/example/testapp/R$id.class
	bin/classes/com/example/testapp/R$layout.class
	bin/classes/com/example/testapp/R$menu.class
	bin/classes/com/example/testapp/R$string.class
	bin/classes/com/example/testapp/R$style.class
	bin/classes/com/example/testapp/R.class
	bin/dexedLibs/android-support-v4-e916d7b109e86c19f285cc72f1c47953.jar
	bin/resources.ap_
	gen/com/example/testapp/R.java
	project.properties
	res/values/colors.xml
	res/values/strings.xml
	src/com/example/testapp/BusActivity.java
	src/com/example/testapp/MainActivity.java
NOTE -- save your project properties elsewhere before pulling, this will remove it from your disk. You will need to rebuild after pulling.
git rm --cached /bin, /gen, project.properties
Merge branch 'busfun'

Conflicts:
	res/values/strings.xml
Fixed merge stuff. Learn to merge.