There and back again.
Work or get fired, choose one.
Merge branch 'source' of github.com:ProfessorX/ProfessorX.github.io into source

Conflicts:
	source/_posts/2014-04-21-lab4.markdown

Commit and working.