autosave
autosave
Merge remote-tracking branch 'greg/master'
added state diagram