update
-a
update
Merge branch 'master' of github.com:skitta/Luoo

Conflicts:
	.gitignore