Init ProjectOil
Merge branch 'master' of https://github.com/YuanLiou/ProjectOil

Conflicts:
	.gitignore