test
Merge branch 'master' of https://github.com/iomodo/FreeuniRestaurant

Conflicts:
	build/classes/ge/edu/freeuni/restaurant/logic/DBConnector.class