Still trying to figure out how to do merging properly...
Revert "Still trying to figure out how to do merging properly..."

This reverts commit 222898dc86906c148ba0a5507d48ee98835722c3.
Merge branch 'master' of https://github.com/dodyg/AndroidRivers