gitignore
gitignore
Merge remote-tracking branch 'refs/remotes/origin/master' into doorkeper

Conflicts:
	app/views/welcome/_top_menu.erb
Merge pull request #2 from Bedunkevich/doorkeper

gitignore