textmaker
Merge branch 'master' of https://github.com/klados/firstBoot

Conflicts:
	firstBoot.sh