Merge remote-tracking branch 'tom/master'
Merge remote-tracking branch 'tom/master'
Merge remote-tracking branch 'tom/master'
Merge branch 'master' of github.com:jwbuurlage/Arya
Merge branch 'master' of github.com:jwbuurlage/Arya
changed unit values and cleaned it up so that it is easier to make other units