Update games.js
Update trainercards.js
.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	funstuff/trainercards.js

.