Merge pull request #51 from Team-Combat-Wombat/dev-addedCopyrights

removed authors, added contibutors
Revert "Merge fixes"

This reverts commit 272097483051d58071d65ecbf336f9d041e85cbf.
Merge branch 'dev' into dev-addedCopyrights