Initial commit.
Merge branch 'master' of github.com:n1207n/Sunshine

Conflicts:
	.gitignore