update current changes
Merge branch 'master' of https://github.com/Chunbinlin/Context-Sensitive

Conflicts:
	Main-memory-columnDB.tex