Outlining stuff
Merge branches 'master' and 'master' of https://github.com/Ocirina/CRIA
Merge branch 'master' of https://github.com/Ocirina/CRIA