test
Merge branch 'master' of https://github.com/sonnylazuardi/alay

Conflicts:
	bin/alay/Main.class
	src/alay/Main.java