fixed order
Merge branch 'develop' of github.com:krageon/battleship-clojure into develop