first commit
Merge branch 'master' of github.com:eyy/sun

Conflicts:
	.gitignore