Adding latest
Merge branch 'master' of https://github.com/lisafrench/refugerestrooms into lisafrench-master
Merge branch 'lisafrench-master'

Conflicts:
	app/views/layouts/application.html.erb