initial commit
Merge https://github.com/ericadamski/FTP_Assignment