Initial Commit
Fixed bugs
	fddfs
2-5-2012 4:58pm
Finished
added ignore file
Merge branch 'master' of https://github.com/martyu/CS311_Assignment1

Conflicts:
	.gitignore