added some new stuff
Merge branch 'master' into Branch_NewFlorin

Conflicts:
	index.html
Merge remote-tracking branch 'remotes/origin/master' into myBranch