working on finish screen
Merge branch 'master' of github.com:jeremykao/Twinet push origin master:x