temp check in
Merge branch 'master' of https://github.com/edisonwinner/chopntoss
UI complete