commit before pull
Merge branch 'master' of https://github.com/lynneokada/Dream-Share

wheeee merging benji's notes
tags half way