Numbers on the grid!
Merge branch 'feature'

Conflicts:
	main.js