Added feature two
Merge branch 'feature-two' into dev

Conflicts:
	src/main/java/Main.java