Merge branch 'master' of https://github.com/gjacoby126/rideshare

Conflicts:
	model/address.pyc
	model/event.pyc
	model/eventrepository.py
	model/eventrepository.pyc
	model/userrepository.py
	model/userrepository.pyc
Merge remote-tracking branch 'origin/master'