beginning to wire up project tiles
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/index.html
wired up tiles