Revert "Testing my merging abilities"

This reverts commit 1f663f4ec5d0bd702b0e75fb9130654a41c6a7eb.