Added main!
Merge branch 'master' of https://github.com/achat/Project1.git

Conflicts:
	Project1/src/Alpha.java