untracked /bin and /obj
Merge branch 'master' of https://github.com/stufkan/Risk
Merge branch 'model' of https://github.com/stufkan/Risk into model