Added file to test git operation.
Removed testfile.
added back src and bin
fixed again?
Merge branch 'master' of git@github.com:lstyls/nachos.git

Conflicts:
	nachos/.gitignore