more troubles with CDE i hope this works
Merge branch 'master'

Conflicts:
	pages/about.html