making sure changes are commited to github
Merge branch 'staging'