Merge branch 'master' of https://github.com/dkeener7/mailbox

Conflicts:
main.cpp
Merge branch 'master' of https://github.com/dkeener7/mailbox

Conflicts:
	main.cpp
Revert "Merge branch 'master' of https://github.com/dkeener7/mailbox"

This reverts commit 2ee8b64273b17628f95b32b85ff3a9802ed10ff8, reversing
changes made to 0c9c6e3da9b52dfb2ae536b316a31a9da1dbc747.