changed text color for some elements
Merge branch 'master' of https://github.com/ImMax/Pokedex

Conflicts:
	root/index.jsp