committing to pull matt's changes
fixed conflicts in notes.txt