Added basic unit testing
Merge branch 'master' of github.com:kustom666/Demacia