adaptation
Merge branch 'master' of github.com:agostinhobritojr/blokbox

Conflicts:
	blokbox.pro.user