UI commit
Merge branch 'master' of https://github.com/nickgeorgiou/native-pokemon

Conflicts:
	app/index.html
	app/views/main.html