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

Conflicts:
	app/views/rooms/index.html.erb
	db/development.sqlite3
	log/development.log