added code
Merge branch 'master' of github.com:magicgoose/funnyandroid-cs