Revert "Merged other"

This reverts commit 4077274757fe60a6330406f67ad2e2292cce5f53, reversing
changes made to d9533adab961f82028daeecb36e78967e535039c.
Added git ignore.
Merge branch 'master' into HEAD