no message
committed Stephany added "cosponsoring orgs" option to create event post
Added rails-erd
Merge branch 'master' of github.com:stevemcquaid/cmunity

Conflicts:
	Gemfile.lock

Temp Stash
Merge branch 'style' into sean
bundle
Added more association definitions to models
Merge branch 'master' of github.com:stevemcquaid/cmunity

Conflicts:
	Gemfile.lock
Merge pull request #21 from stevemcquaid/sean

Sean
Merge pull request #20 from stevemcquaid/stephany

updated co-sponsor stuff
-forms Stephany
Merge branch 'style' of https://github.com/stevemcquaid/cmunity into style
Merge branch 'style'
Merge branch 'master' of https://github.com/stevemcquaid/cmunity
STEPHANY SAVES THE DAY!