changes in staging branch
removed index.html from staging
using theirs
using theirs
using theirs
updated index.html
Merge branch 'development' into staging
Merge branch 'staging'
Merge branch 'development' into staging
Merge branch 'staging'
added Bitcoin payments