Initial commit from local git
initial merge to sync local git with remote git
Merge branch 'master' of github.com:Tsaude/Pokedex