new .gitignores
merging in changes from external project
merging in changes from external project
removed some files
fixing merge conflicts
merging in changes from external project
merging in changes from external project
merging in changes from external project
Revert "merging in changes from external project"

This reverts commit 3dff12f1bc7c2de30d31181303c59a3157d60395.
Revert "Revert "merging in changes from external project""

This reverts commit bd9270c6c0334c94aa569575bfa3790ad7c25789.
Revert "Revert "Revert "merging in changes from external project"""

This reverts commit 5f0a71dd3f9d9712b2977eef35f8b4ee89a77f80.
Revert "Revert "merging in changes from external project""

This reverts commit bd9270c6c0334c94aa569575bfa3790ad7c25789.
Revert "merging in changes from external project"

This reverts commit 3dff12f1bc7c2de30d31181303c59a3157d60395.
Revert "merging in changes from external project"

This reverts commit 7d33ce0d17529dbc1ba5ca69c32e29642ef40d77.
Revert "Revert "merging in changes from external project""

This reverts commit 9a455a71308771288223318df4fd43390908bce7.
Revert "Revert "merging in changes from external project""

This reverts commit 1a16bf283c818a68324b72380b77cbffd5b03c84.
Revert "Revert "Revert "merging in changes from external project"""

This reverts commit b667e0667c59f0368e2a970529637f0ba68755d3.
Revert "Revert "Revert "Revert "merging in changes from external project""""

This reverts commit fdb7200457067657f3bb259a928d402777fa9245.
Revert "Revert "Revert "merging in changes from external project"""

This reverts commit 5f0a71dd3f9d9712b2977eef35f8b4ee89a77f80.
Revert "Revert "merging in changes from external project""

This reverts commit bd9270c6c0334c94aa569575bfa3790ad7c25789.