this should be ignored
getting new gitignore

Conflicts:
	config/secrets.yml