add button function to content link
Merge branch 'master' of https://github.com/Hiroyuki-Shinoe/camp into UI1
Merge pull request #2 from Hiroyuki-Shinoe/campbranch

Campbranch
merge
heroku
heroku
Merge pull request #3 from Hiroyuki-Shinoe/campbranch

fix layout
heroku
heroku
heroku
heroku
fix conflict
heroku
add assets
Merge branch 'master' into UI1
heroku
modify database
fix conflict
add singin & login & header
fix conflict