change seeds.rb
-add guest user
change travis.yml
- rake db:reset
Merge branch 'develop' of http://github.com/ttamura204/pjSearch into staging
change travis.yml
- rake db:reset
change travis.yml & database.yml
Merge branch 'develop' of http://github.com/ttamura204/pjSearch into staging
seeds.rbをproduction用に変更
guestuser chenged
change seeds.rb
Merge branch 'develop' of http://github.com/ttamura204/pjSearch into staging
Merge branch 'staging' of http://github.com/ttamura204/pjSearch
chenge seeds.rb
 admin,guest
add Gemfile -thin
Merge branch 'develop' of http://github.com/ttamura204/pjSearch into staging
Merge branch 'master' of heroku.com:pjsearch-staging into staging

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'develop' of http://github.com/ttamura204/pjSearch into staging
Merge branch 'develop' of http://github.com/ttamura204/pjSearch into staging
Merge branch 'staging' of http://github.com/ttamura204/pjSearch
Merge branch 'develop' of http://github.com/ttamura204/pjSearch into staging
Merge branch 'staging' of http://github.com/ttamura204/pjSearch