Event page
Merge branch 'master' of https://github.com/tedsunnyday/SE-Server
Merge pull request #34 from mengci/master

Event page
SMS messaging
Merge branch 'master' of http://github.com/tedsunnyday/SE-Server
add comments to backend code
Merge pull request #35 from melodylhsy/master

one bug in search radius fixed
update readme to include a block describing basic design pattern
Merge branch 'master' of https://github.com/tedsunnyday/SE-Server

Conflicts:
	controllers/match_controller.py
	templates/event.html.MERGE.html
Merge pull request #36 from yuanxiacpp/master

add comments to backend code
nearby filter
nearby filter
refactor code base
merge comments