whew
more conflicts solved
Merge branch 'louie-branch'