intial commit
Merge branch 'master' of https://github.com/edge/blairbash-android-2