Update app.rb
Merge branch 'master' of https://github.com/akxs14/campaign-dashboard

Conflicts:
	app.rb