Merge branch 'Modeling-users' of https://github.com/ckumar1/smart-fridge-rails into Modeling-users

Conflicts:
	app/views/layouts/application.html.erb
	app/views/static_pages/home.html.erb
Merge branch 'Modeling-users' of https://github.com/ckumar1/smart-fridge-rails into Modeling-users

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

Finish homepage