All the things
Merge branch 'master' of https://github.com/savannahjulian/slj-portfolio

Conflicts:
	single-work.php