add some notes
test for c9
Merge branch 'staging'