[UPD] ignored garbage files
Merge branch 'master' of https://github.com/phinfonet/Minerva

Conflicts:
	.gitignore
[UPD] ignored .rvmrc