upload hans
Merge branch 'Hans' into maxdevelopment

Conflicts:
	index.html