Commit before pulling. No changes
Dumy empty message
Merge branch 'master' of https://github.com/nicolaje/reliable-slam

Conflicts:
	doc/Report/Jeremy-Nicola_Reliable-Slam/Jeremy-Nicola_Reliable-Slam.tcp
	doc/Report/Jeremy-Nicola_Reliable-Slam/Jeremy-Nicola_Reliable-Slam.tex