fix edit link
fix profile page crashing.
Merge pull request #49 from yuchan/fix-profile-page

fix profile page crashing.
Merge pull request #48 from yuchan/fix-edit-link

fix edit link
downgrade ruby
Merge pull request #50 from yuchan/yo-downgrade-ruby

downgrade ruby
revert .travis.yml
Merge pull request #51 from yuchan/yo-downgrade-ruby

revert .travis.yml
modify heroku appname.
remove rspec's warning option
Merge pull request #52 from SocioQuiz/project-rebuild

self merging.
Merge branch 'master' of https://github.com/SocioQuiz/socio_quiz

Conflicts:
	.travis.yml