@elagin
elagin Merge branch 'master' of https://github.com/elagin/pluto
d2a9cdd Mar 28, 2016
Merge branch 'master' of https://github.com/elagin/pluto 
Conflicts:
	pluto.files
	src/kalman.h
d2a9cdd