Merge branch 'master' of github.com:irmiller22/noted