Merge pull request #81 from Watchful1/master

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

Conflicts:
	source/mainClass.java
Test with branches
Merge pull request #82 from Watchful1/dev

Dev