changed main
Merge branch 'master' of git://github.com/achat/testEGit.git

Conflicts:
	src/Main.java
added attribute x
Merge branch 'master' of git://github.com/achat/testEGit.git
added attr b