First steps
Merge branch 'develop' of github.com:ellnestam/battle into develop