Added the rest of combo boxes
Merge branch 'master' of https://github.com/mustafatasdemir/astreoidhackathon