added notifications on out of stock
Merge branch 'master' of https://github.com/knigam/Room-Mate

Conflicts:
	app/models/user.rb