Updating the repo
Merge Conflicts Resolutions
Pushing UserProfile stuff
Mark doesnt know how to computer
Merge pull request #6 from PJDesi/things

Things