Merge branch 'upstream' into kyoichiroiizuka
Merge commit 'a6e423144fae5369d47fe91b91a635c959d48f6e' into kyoichiroiizuka
time zone set to Tokyo
Merge commit 'b83995f3888f0e6858e479901227bb6d4f08fae3' into kyoichiroiizuka
add time
User has user name column (please migrate after applying)
change column of table
name edit
Merge commit '036b0717ee5289778ead48c9c00a76c92c69f984'
validation
Merge commit '745d4c71523105f964f3af0bd8dcf9a8757b0601'

Conflicts:
	app/models/question.rb
link to new question
fix models and question*/index.html.erb