commiting before syncing w/ github
Merge branch 'master' of https://github.com/bensonz/super-benjalong

Conflicts:
	EventWizard/EventWizard/Base.lproj/Main.storyboard
post pull commit
Merge branch 'master' of https://github.com/bensonz/super-benjalong
Merge branch 'master' of https://github.com/bensonz/super-benjalong
push trying to fix mainstory board
before push