Updated image refs
Updated file references
Updated instructions
Added WindowListener
Merge branch 'master' into ui
Updated saving variables