still more push
more merge
Merge branch 'master' of https://github.com/erikarthur/csci5211Peer

Conflicts:
	peer/getFile.cs
	peer/server.cs