Mer chat
Merge branch 'master' of https://github.com/GrayOverride/OpenDataDAy

Conflicts:
	Gemfile.lock
	app/views/home/index.html.erb