YAY THE STUPID PEN IS FINALLY STARTING TO WORKgit statusgit statusgit status OMGGGGG I'M SO HAPPYgit statusgit statusgit statusgit statusgit status
Yet even more merge conflicts due to Daniel's newbieness...