Created feature one
Merge branch 'feature-one' into dev

Conflicts:
	src/main/java/Main.java