Basic scan screen
put api
Merge branch 'master' of https://github.com/ndemoor/hackathon