dev progress
Merge branch 'master' of https://github.com/Jerkovic/kitten-battle