TF: latest changes 3:17pm
Merge branch 'master' of https://github.com/Willfire19/Usephoria
Merge branch 'master' of https://github.com/Willfire19/Usephoria