unit and team classes added
merge
units added to scene
controls added