working on presentation
Merge branch 'master' of github.com:zhangjunsin/report

Conflicts:
	.gitignore