Add some TODOs
Merge branch 'master' of https://github.com/t3kk/Satisfaction.git

Conflicts:
	Satisfaction
Prototypes/src/com/ragglefraggle/satisfaction/proto/ProtoMain.java
	Satisfaction
Prototypes/src/com/ragglefraggle/satisfaction/proto/ReadWrite.java