beta updated
Merge remote-tracking branch 'origin/master'

Conflicts:
	AlphaProject/bin/BetaClass.class
	AlphaProject/src/BetaClass.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	AlphaProject/bin/BetaClass.class
	AlphaProject/src/BetaClass.java