Revert "Merge branch 'master' of https://github.com/Jondisaurus/CSS432FinalProject"

This reverts commit 919309f9dc7dffd78013cc206c921e23efaca1a7, reversing
changes made to 80e0803edcb8c7a8efa7f2b19ce92b1156c9e837.
Revert "Revert "Merge branch 'master' of https://github.com/Jondisaurus/CSS432FinalProject""

This reverts commit f417772fb5993a801a763da080e65dcae713bece.
fixed broken stuff from the merge
additional broken stuff fixed

I should probably compile before commiting next time…
Merge branch 'master' of https://github.com/Jondisaurus/CSS432FinalProject

Conflicts:
	FTPClient.h