comp
merge conflicts
Merge branch 'master' of https://github.com/tnason/CoE1186
updated init