added some dummy units for testing
Merge branch 'master' of https://github.com/nmhall/project