wip refactor
Merge branch 'animation' of github.com:happypoulp/pinyourcode into animation

Conflicts:
	routes/index.js