j
Merge branch 'master' of https://github.com/Adddrian/Smart-fridge.git

Conflicts:
	test3/src/de/vogella/git/first/Testas.java