Stuff I'm working on
Merge branch 'master' of https://github.com/Darwly/ducky

Conflicts:
	.gitignore
	duckyU/Library/guidmapper