first commit, kinda-sorta
Merge branch 'master' of https://github.com/JohnNathan/Pokemon_Clone

Test test 1, 2, 3