Merge branch 'master' of /users/ugrad/j/jbdennin/workspace/cs470 with conflicts.
update kalman filter