remove tmp file
delete tmp in gitignore file
prototype
index
changed gitignore to ignore module and others
added untracked files
deleted tmp
prototype
index
deleted tmp
solve conflicts
excluded .classpath and .settings
solve .gitignore conclicts
Post conflicts solved
Merge branch 'WenboHuang'

Because
ignored server.pid
merge linxj