show again
Merge branch 'MTbranch' of https://github.com/mikeTong/Roommate-Matching-System into MTbranch

Conflicts:
	db/development.sqlite3
	log/development.log
	tmp/pids/server.pid
try again