Project finally completed -- damn gui's
Final .jar
Merge branch 'dev'

Project completed need to merge