styling WIP
added placeholders
Merge branch 'styling'

Conflicts:
	public/script.js