got shit done, still buggy
Merge branch 'master' of https://github.com/hugo-devs/grumpy-cat

Conflicts:
	assets/data/attacks.json