Gitting things in order
Merge branch 'master' of https://github.com/idreyn/Sigmabox

Conflicts:
	.DS_Store