Updated interfaces to nio
Cleanup
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/github/ai14/prosammgen/App.java