updates progressbard
Merge branch 'master' of github.com:kshmir/ss-2013

Conflicts:
	app/workers/sim_worker.rb
algorithm kinda works
Merge branch 'master' of github.com:kshmir/ss-2013
migrations y nosequeotrascosas
bugged!
fixes animations
Merge branch 'master' of github.com:kshmir/ss-2013