trying to fix merge conflicts
Merge branch 'master' of github.com:dan987/notetaker into user_notes
stashing recorder.js.erb
stashing recorder.js.erb
recorder.js
Merge branch 'master' of github.com:dan987/notetaker into user_notes
got aws working, started on building notes feature
Merge branch 'user_notes'
merging