Maybe finished the pastCharactersState?
Merge remote-tracking branch 'origin/master' into BranDev-Branch
Merge remote-tracking branch 'origin/master' into BranDev-Branch
Finished pastCharactersState
Fixed a bug (that Johnny found) in blacksmithState
Merge remote-tracking branch 'origin/master' into BranDev-Branch
Re-added the hidden tag

It was overwritten i guess?
Merge remote-tracking branch 'origin/master' into JohnDev-Branch