Merging
Merge branch 'master' of https://github.com/pxinghao/occ-submodularmax

Conflicts:
	nips2014/parallel_submodular.log
	nips2014/parallel_submodular.pdf
Mergining