Revert "third commit"

This reverts commit a7d98e0b0d016a212b20fc163e75bd1880dd0ec8.

Conflicts:
	.gitignore