home page top session
ignore the .DS_Store file
commit
Merge branch 'master' of https://github.com/ideapuff/proving

Conflicts:
	log/log_20130817txt