Merge pull request #7 from GLoganDR/users-edit

Users edit
Big fixed
Bug fix
Merge branch 'bug-fix' of https://github.com/GLoganDR/furry-farm into bug-fix
Bug fixed for upload photos/edit profile
Removed photos
Merge pull request #8 from GLoganDR/bug-fix

Bug fix
Merge pull request #1 from jbrooks036/master

Master