working on pacxon
Merge branch 'master' of https://github.com/mattydoincode/games

Conflicts:
	routes/index.js
Merge branch 'master' of https://github.com/mattydoincode/games