edit
Merge branch 'master' of https://github.com/i3-Arch/Arch-Installer

Conflicts:
	installer.sh