Some small changes
Small changes
Merge branch 'master' of https://github.com/1lann/pokeson
Merge school stuff with home stuff