Sandy Second Commit
Merge branch 'master' of https://github.com/hendriqis/systemsetup

Conflicts:
	SystemSetup/SystemSetup.suo