Merge branch 'master' into UI_branch
working
Merge branch 'UI_branch'
Merge branch 'master' of https://github.com/nickgeorgiou/native-pokemon