Only a couple comment edits, so this will probably destroy the project.
Merge branch 'master' of
https://github.com/bmwinstead/enigma-project.git

Conflicts:
	enigma-project/src/main/java/enigma/EnigmaSettings.java
Conflict fix.