main story board and splash screen
Event class
Edited the Event Class
Merge branch 'Jackson-' into Alex

Conflicts:
	BioFarm_NEW/BioFarm/BioFarm.xcodeproj/project.pbxproj