Hi
Merge branch 'master' of https://github.com/g0ddish/3095F14As1_Alex_Yael

Conflicts:
	nbproject/private/private.properties
	nbproject/project.properties
Revert "Hi"

This reverts commit db81c0e41c70aec16dd503a6811e47c5e86d5413.