Todo List

If you want something to do, go through the todo list
Merge remote-tracking branch 'origin/master'

Conflicts:
	Code/Tracking.c
	Code/newmain.c