Implemented step2

Conflicts:
	tdd-01/code/src/com/company/Main.java
Some cleaning of code