a little changed
Merge branch 'master' of https://github.com/matcho3/HIKERS into trip
image added
conflict is fixed
my trip is added on header
triplist complete
my trip on the header
conflict is fixed
List your trips' error fixed
Merge pull request #39 from matcho3/design

Design
Merge pull request #40 from matcho3/design

fixed
message ok
message revised
link_to
user_info
message validates
Merge pull request #41 from matcho3/design

Design
modal1
conflict fixed
Merge pull request #42 from matcho3/design

Design