first commit
Merge branch 'master' of https://github.com/nicolas-ivanov/Rino

Conflicts:
	.gitignore