temp
not important
Merge branch 'master' of https://github.com/otarazan/homy

Conflicts:
	homy/db/h2/play.lock.db
depositbox.html file changes
deposit box file changes(not important for other classes)
no message
Merge branch 'master' of https://github.com/otarazan/homy

Conflicts:
	homy/.classpath
	homy/.project
	homy/app/controllers/Deposit.java
	homy/db/h2/play.h2.db
	homy/eclipse/classes/controllers/Deposit.class
	homy/eclipse/classes/models/DepositBox.class
	homy/eclipse/classes/models/DepositBoxItem.class
	homy/eclipse/classes/models/GroceryItem.class
	homy/eclipse/classes/models/GroceryList.class
	homy/eclipse/classes/models/Room.class
	homy/eclipse/classes/models/Roomy.class
	homy/eclipse/classes/models/Task.class
	homy/eclipse/classes/models/TaskTable.class
tmp
deposit box page - done
Merge branch 'master' of https://github.com/otarazan/homy