Yo maaan.
Merge branch 'master' of github.com:gabrielf/devnull

Conflicts:
	.gitignore