Finished form
Merge branch 'master' of github.com:kunalp320/roomie

Conflicts:
	app/assets/.DS_Store