Updated data file with Joel's information (and added his picture to assets)
Merge branch 'master' of github.com:Pitt-CSC/pitt-csc.github.io

Conflicts:
	_data/officers.yml
Snake case
Merge branch 'master' into design