ch- ch- ch- changes (turn and face the stranngggeee)
okey Merge branch 'master' of https://github.com/cposner/housing

Conflicts:
	app/controllers/clients_controller.rb