Uploaded most recent UMBCEvents!
Merge branch 'master' of https://github.com/ninjanicely/proj2.git

Conflicts:
	UMBCEvents!/bin/classes/android/support/v7/appcompat/R$color.class
	UMBCEvents!/bin/classes/com/example/umbcevents/MainActivity.class
	UMBCEvents!/bin/classes/com/example/umbcevents/OrganizationForm.class
	UMBCEvents!/bin/classes/com/example/umbcevents/R$color.class
	UMBCEvents!/bin/classes/com/example/umbcevents/R$id.class
	UMBCEvents!/bin/classes/com/example/umbcevents/StudentActivity.class
	UMBCEvents!/gen/android/support/v7/appcompat/R.java
	UMBCEvents!/gen/com/example/umbcevents/R.java