Revert "Reverted all changes made after merging"

This reverts commit edb9136bfee0edb2174d2909c8e1ff9c20b0240d.
Revert "Added instructions"

This reverts commit 76d3ebe90f90ad14c1728c0f63df0d1bc356342c.
Revert "Updated .gitignore again"

This reverts commit cf2c493105a51fb0f57fb085b05a8ad50bf4e7ff.
Revert "Updated .gitignore"

This reverts commit 4255114775db8490569a987ce4461c7c614f82ef.