newc ommits
Merge branch 'master' of github.com:thinkdrop/source
new commits