Adding note view
Added shared files to Ben's branch
merge changes
fixed merge