Add TODO
Update TODO
Updated TODO again
Update TODO again 2
Updated README
Merge remote-tracking branch 'origin/master' into feature/1234_chris_feature_2

Conflicts:
	README.md
Merge pull request #2 from nicholasf/feature/1234_chris_feature_2

Feature/1234 chris feature 2