change
Merge branch 'master' of https://github.com/hankchan/bbb_sd_image_builder

Conflicts:
	target/chroot/beagleboard.org-console.sh