getting ready for merge
Failed to merge and commiting reverted state of my develop branch.
Adding second set of scene's for the old man.
I think I've managed to merge our work.
This time there merged I swear
Just refactored some scripts a little.
Adding stuff blarg
Merge conflict again.