front-end stuff
Merge branch 'frontend'

Conflicts:
	.gitignore