Merge branch 'develop' of github.com:laroque/simple_tracker into develop
Working on output.