Initial commit of working code.
Edited the readme
Merge branch 'testfeature' into staging
Merge branch 'staging'