Merge pull request #97 from Watchful1/dev

Dev
Merge

Conflicts:
	.idea/artifacts/PermChecker_jar.xml
	source/gr/watchful/permchecker/datastructures/ModPack.java
	source/mainClass.java
Merge pull request #98 from Watchful1/dev

Merge
Merge pull request #99 from Watchful1/master

Merge, again