Revert 7feb990..c112bb4

This rolls back to commit 7feb99039c46fbdf20e33159868b2d3b1707564a.
Revert c0754c5..fdeb435

This rolls back to commit c0754c5b51d7c7e7cdce1442885ca86783ffb11d.
Revert "test3"

This reverts commit 1fed89012d92b9424e41c1314ea44998f32fa3f9.

Conflicts:
	.gitignore