sfasd
Merge branch 'master' of https://github.com/ReinhardVuks/navus

Conflicts:
	.gitignore
gyu