added sift and university
resolved conflicts
Merge branch 'master' of github.com:Gibolt/Populess

Conflicts:
	src/final_main.m
	src/poissonBlend.m
	src/repair_median.m