user file excluded
Merge branch 'master' of https://github.com/amonszpart/KinfuSuperRes

Conflicts:
	SuperRes-NI-1-5/CMakeLists.txt.user