Added basic files

Added server and testclient files

added make file for server

added *.swp to gitignore for vim swap files
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project1/Server/makefile