Blup
Merge branch 'master' of github.com:roeles/maccready

Conflicts:
	code/kalman_filter.py