Test with branches
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	source/mainClass.java
Test with branches