Commiting before pulling
Merge branch 'master' of https://github.com/valentinp/aer1513project
First draft of the feature tracking and state pruning done
Merge branch 'master' of https://github.com/valentinp/aer1513project