change indents
change indents
Merge commit '93f3f5ee34ae73704d8ef42defcb527055273445' into front-end

Conflicts:
	app/templates/application.hbs
	app/templates/index.hbs
Add controller for adding payment method