rm comment out codes
fix the bug of calculate score
Merge pull request #92 from caok/master

fix the bug of calculate score
fixed tiny display issue
added script to restart unicorn server
Fixed #86
updated union seed to support repository and link with project
Update score.markdown
Update score.markdown
Merge branch 'master' of github.com:bay6/union
updated rake task for delay job
Create nginx.conf
Update unicorn.rb
Create tech.markdown
Update tech.markdown
Merge remote-tracking branch 'upsteam/master'

Conflicts:
	app/controllers/users_controller.rb
Merge pull request #96 from mouse-lin/master

users index all users
merge