Editing now works but a little buggy, got rid of some unused stuff, added editing location to User class
Merge remote-tracking branch 'origin'