Merge branch 'master' into styles
Merge branch 'master' into styles
Working on fixing drag and drop modal
Merge pull request #5 from manonthemat/styles

Styles
fixed invites and restyled welcome page
Merge branch 'master' of https://github.com/manonthemat/Wefridgerator
restyled welcome page with new image
Merge branch 'master' of https://github.com/manonthemat/Wefridgerator

Conflicts:
	app/views/users/new.html.erb
readded new header image
shows temperature only when temperature of fridge is known