added some new stuff
Merge branch 'master' into Branch_NewFlorin

Conflicts:
	index.html