add more to gitignore
update .gitignore
Merge branch 'master' of https://github.com/kunyuan/DiagMC-time

Conflicts:
	.gitignore
Merge branch 'test-mc1'

Conflicts:
	.gitignore
	program/all_input.txt
	program/logfile.txt