init the empty project
Merge commit '3433329f91f6445895920b75230cbebcbb3a30e9'

Conflicts:
	.gitignore
Merge remote-tracking branch 'github/master'

Conflicts:
	.gitignore