Redding start
Merge branch 'master' of github.com:clashway/redding

Conflicts:
	.gitignore