Still working on making the UserProfile class baller
Merge remote-tracking branch 'origin/master'