Save state
Merge branch 'master' of https://github.com/derbarenjude/squirtle
EVERYTHING DUDE
Fixed merges