local
Merge remote-tracking branch 'origin/master'

Conflicts:
	AlphaProject/src/AlphaMain.java
beta was called