fixing some comments etc
fixing merge
Merge branch 'master' of github.com:sidharthm/CS485TFS
added file nums to messages
Merge branch 'master' of github.com:sidharthm/CS485TFS
anticipating merge
merged