Merge branch 'master' of https://github.com/tkwidmer/refugerestrooms

Conflicts:
	config/database.yml
resovling conflicts
reseting css file
redoing css file