new TODOs and exporting midi
merge conflicts in TODO resolved
Merge branch 'master' of https://github.com/ireardon/cs32-final

Conflicts:
	src/TODO.txt