Finish merging, i suck at git
[cascardo/gnio.git] / TODO