Update?
Merge branch 'Josh_Development' into Merge_Test
Animation Fix
n/a
Fixed health and stamina bar
Changed stamina to 100
Changed health regen rate to 1 every 10 seconds
Added a stop sprinting function
Changed maps
N/A
Conflict Fixes

Every time James.

Every time.
The Magic File Deleting Update

For some reason, a load of files, which I never knew existed, have been
deleted.

Lolwut? - I literally have just made a commit and all these files have
randomly been deleted, oh well - they were never added in the first
place...
Notin
Fixed James's Texture Bugs
Actually Fixed James's Texture Bugs
Merge remote-tracking branch 'origin/James_Development' into George_Development
Merge branch 'George_Development' of https://github.com/ducsuus/Game_001 into George_Development
N/A
Merge remote-tracking branch 'origin/George_Development' into Merge_Test
Merge branch 'James_Development' into Merge_Test

Conflicts:
src/js/entities/player/player.js