create project
Merge branch 'master' of https://github.com/Avene/Livina

Conflicts:
	.gitignore
create project