Major super commit
Merge branch 'master' of https://github.com/tdegenko/CSC296Final

Conflicts:
	pokeEdit.php