refs #60 'rails generate migration RemoveEmailFromUsers email:string'
refs #60 bug fix
refs #22,#20 add link and mod rayout
Merge branch 'master' of https://github.com/doyomeki/matsuri2 into develop
refs #61 password and password confirmation is confirmable
Merge branch 'master' of https://github.com/doyomeki/matsuri2
mod timetable layout
mod content layout
Merge branch 'develop' of https://github.com/doyomeki/matsuri2
cahnge link to time talbes
modify production.rb serve_static_assets = true
add precomiled assets
modify rails_12factor
modify application.rb
modify user default picture changed
Merge branch 'master' of https://github.com/doyomeki/matsuri2 into develop
Merge branch 'master' of https://github.com/doyomeki/matsuri2
Merge branch 'develop'
fix seeds
Merge branch 'develop'