notes
Merge branch 'master' of github.com:svnpenn/a