First lesson finished
Merge branch 'master' of github.com:slygent/sunshineapp

Conflicts:
	.gitignore