added commented-out events and notes on events to be used for reconnection
Merge branch 'master' of https://github.com/obs619/thesis
minor changes