nilavu.yml
Merge branch 'master' of https://github.com/thomasalrin/nilavu

Conflicts:
	Gemfile.lock