added newrelic yml file
Update .gitignore
Merge branch 'master' of github.com:m-antis/f-a-b

Conflicts:
	Gemfile
	Gemfile.lock