Main method
C2
modified Main class
modified Main class
Merge branch 'develop'

Conflicts:
	src/main/java/console/Main.java
push