init
Fixed error on merchant show
Fixed merchant controller bug
Front page fix
Front page wording