#20 create controller of member
Add controller and Delete index.erb
Edit haml
Set rooting
Delete file and Rename contoller and Edit haml root
Merge branch 'master' into create_controller_of_member

Conflicts:
	Gemfile.lock
Delete header
Merge branch 'master' of github.com:yochiyochirb/kajaeru into create_controller_of_member
Add rabbit.jpg

Conflicts:
	app/views/members/index.html.haml
Merge branch 'master' of github.com:yochiyochirb/kajaeru into create_controller_of_member

Conflicts:
	config/routes.rb
Marge katorie's commit to root.rb
Merge root.rb and edit for Ruby 1.9
Merge branch 'master' of github.com:yochiyochirb/kajaeru into create_controller_of_member
Edit routes.rb for Ruby 2.0.x
Delete empty line
Change method of routes.rb
Merge pull request #27 from yochiyochirb/create_controller_of_member

#20 #32 対応。TOP画面の作成/表示、ルーティングの設定
create  "new" method of the VotesController
Unified hash syntax
Fixed request parameters