updates
Merge branch 'master' of https://github.com/briananderson1222/FloRida