Revert "asdad"

This reverts commit fc414c895816ad459b02abb83affb7bd4f34e29a.
Revert "Revert "asdad""

This reverts commit 9995e0abe362086a0d0c80a99263166ac0dc4444.
Merge branch 'master' of https://github.com/gallonp/GiambiAndroid