deploytest
deploy test2
auto width
Merge branch 'master' into funke

Conflicts:
	index.html