TODOs in comments
Merge branch 'master' of github.com:ygnessin/highlight_reel

Conflicts:
	README.md