Merge pull request #22 from tamuratt/master

トピックの登録
Update 20131209051333_add_user_idx_to_users.rb

ごめんなさい、間違えて挙げてしまいました
roll & cancan add by miyagi
Merge pull request #23 from Kouichi-MIyagi/master

roll & cancan add by miyagi
Merge http://github.com/ttamura204/pjSearch

Conflicts:
	Gemfile