done on pc git
new file added from pc
fix future paragraph
Merge branch 'staging'