gitignore
Merge branch 'master' of github.com:fpalomo/random-number-generator

Conflicts:
	.gitignore