Befor first pull
Merge branch 'master' of https://github.com/ttamura204/pjSearch

Conflicts:
	db/schema.rb
Merge branch 'master' of https://github.com/ttamura204/pjSearch

Conflicts:
	db/schema.rb
before pull from ttamura204
dbまわりを修正
マージ前のコミット
Merge branch 'master' of https://github.com/tamuratt/pjSearch into tamuratt-master

Conflicts:
	app/models/user.rb
	db/schema.rb
push test
ユーザID（社員コード）で再ログインできなかった件の対応
Merge pull request #14 from tamuratt/master

アンケート登録画面の追加
Merge branch 'master' of https://github.com/ttamura204/pjSearch

Conflicts:
	app/models/user.rb
	db/schema.rb
Merge branch 'master' of https://github.com/Kouichi-MIyagi/pjSearch into Kouichi-MIyagi-master

Conflicts:
	app/models/user.rb
	db/schema.rb
can create answer
can request for users depends on conditions
can select requested q when answer it
Merge pull request #17 from sankai/master

アンケート回答時にリクエストされているアンケートが開くようにしました。
rename Comment_to_response_item comment:string
    rename_column :response_items, :Comment, :comment
    rename_column :response_items, :selectionNumber, :selection_number
    rename_column :response_items, :selectionItem, :selection_item