deleted:    .codio
	new file:   Install_Scripts/etc/default/couchpotato
	new file:   Install_Scripts/etc/default/deluge-daemon
	new file:   Install_Scripts/etc/default/halevt
	new file:   Install_Scripts/etc/default/headphones
	new file:   Install_Scripts/etc/default/lazylibrarian
	new file:   Install_Scripts/etc/default/plexmediaserver
	new file:   Install_Scripts/etc/default/sabnzbdplus
	new file:   Install_Scripts/etc/default/sickbeard
	new file:   Install_Scripts/etc/init.d/couchpotato
	new file:   Install_Scripts/etc/init.d/deluge-daemon
	new file:   Install_Scripts/etc/init.d/halevt
	new file:   Install_Scripts/etc/init.d/headphones
	renamed:    InstallItAll.sh -> MSP_Installer_Script.sh
	new file:   test.sh
Merge branch 'Pre-Alpha' of github.com:insanepoet/MSP into Pre-Alpha

Conflicts:
	MSP_Installer_Script.sh
	.git/MERGE_HEAD