Added a todo file
Merge branch 'master' of https://github.com/Alzareon/maiproj

Conflicts:
	README.md