made private
Merge branch 'master' of https://github.com/mhartman4/customerio-updates

Conflicts:
	app.rb