Add name and photo
Reformat tabs and quotes
Add image and initial profile
Fix CRLF conflict
Merge branch 'dev'

Conflicts:
	index.html