Started work on the network file sending
Merging issues
Merge remote-tracking branch 'origin/master'

Conflicts:
	server.c
Merge branch 'master' of https://github.com/Rahkeen/CS-3251
Implemented pull