env config for dev
ignore rmvrc files
Merge remote branch 'origin/master'

Conflicts:
	Gemfile