yay
renamed our logic
Merge branch 'master' of github.com:Jegp/ISP2014
renamed to GLaDOS
Also make stuff