Init commit
Merge branch 'master' of github.com:quatermain/Learn2Life

Conflicts:
	.gitignore