update !
Merge branch 'master' of https://github.com/pmrenaud/Alpha12

Conflicts:
	src/com/greattysoft/Alpha12.java