Removed TODO tasks that I've already accomplished.
Merge branch 'master' of github.com:stevex86/Nero