Wildcards allowed with *
Merge branch 'master' of https://github.com/timaeudg/CSSE333--PO-System

Conflicts:
	bin/AdminMainWindow$5.class