First Commit
Merge branch 'master' of https://github.com/aureole999/Sunshine

Conflicts:
	.gitignore