test commit
Merge branch 'master' of github.com:TimMikeladze/js-tower-defense
fixed conflicts