tets2
Merge branch 'master' of github.com:eternalkaif/g-energo

Conflicts:
	PayBillMini/src/Run.java