Makes a new feature.
Merges changes from dev.
Merge pull request #9 from Team-Combat-Wombat/dev-conflict

Makes a new feature.