commit
Merge branch 'master' of https://github.com/SMiLETraceability/website

Conflicts:
	smile/.DS_Store