Removed exclamation mar
Merge branch 'master' into WorkingCopy

Conflicts:
	index.html