meuk2
hoping to fix merge conflict
bla
Merge branch 'devel'

Conflicts:
	pathfinder_robin_erwin/pathfinder_robin_erwin.sdf
	pathfinder_robin_erwin/pathfinder_robin_erwin.v11.suo
	pathfinder_robin_erwin/pathfinder_robin_erwin/pathfinder.c
	pathfinder_robin_erwin/pathfinder_robin_erwin/util.h
..
Merge branch 'master' of https://github.com/erayan/MiDeRP