New todo items.
Merge branch 'master' of https://github.com/k-stachowiak/space-shooter

Conflicts:
	src/states/test_state.cpp