controller tests added
characters table updated
Merge branch 'master' of github.com:JamesTargett/stfu