'init'
gitignore
Merge branch 'master' of https://github.com/xqin/WhatEver

Conflicts:
	.gitignore