added todos
Merge branch 'master' of https://github.com/s-a/octo-space-wars

Conflicts:
	README.md