modified
Merge branch 'master' of https://github.com/westoshy/publiclib

Conflicts:
	lib/libcv.a