initial
implements basic markup and styling
works but unlucky users will get stuck
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore