first commit
Merge branch 'master' of github.com:lucaskatayama/Sunshine

Conflicts:
	.gitignore