This is my last minute save of all of my files. Woo I have a test tomorrow!
Merge https://github.com/febvigrail/compsci