name change
Merge branch 'master' of https://github.com/madhatter1605/combiner

Conflicts:
	combiner lite/src/combiner/lite/BorderReducer.java