First Commit - 2

Signed-off-by: Louis Fischer <fischer.louis.1@gmail.com>
Merge branch 'master' of ssh://git@github.com/FischerLouis/beehive_android.git