Commit before magic merge. Awaiting glorious MSCKF leader
Fixed merge
Fixed another merge
Merge branch 'master' of https://github.com/valentinp/aer1513project
Added sliding window