message is on the way
Merge branch 'master' of https://github.com/matcho3/HIKERS into message
message is addes at search show
Merge branch 'master' of https://github.com/matcho3/HIKERS into message

Conflicts:
	config/routes.rb
conflict is fixed
conflict is revised
conflict is fixed
conflict is fixed
Merge branch 'master' of https://github.com/matcho3/HIKERS into message
message on the header is added
message view create
header change
conflicts are fixed
aaa
Merge branch 'master' of https://github.com/matcho3/HIKERS into message
message error
Merge branch 'master' of https://github.com/matcho3/HIKERS into message
Merge pull request #36 from matcho3/message

Message