inital commit
Merge branch 'master' of https://github.com/TheBigK1d/androidworkspace