Added another message on the main class
reverted merge of feature two
Merge remote-tracking branch 'origin/dev' into feature-two

Conflicts:
	src/main/java/Main.java