LOL
Merge branch 'master' of https://github.com/PennAppsFellows/ProjectPHL into modeling-events
duh
Merge branch 'modeling-events' of https://github.com/purpleladydragons/ProjectPHL into purpleladydragons-modeling-events

Conflicts:
	db/schema.rb
Merge branch 'purpleladydragons-modeling-events'