commit
Merge branch 'master' of https://github.com/sahiltrikha/jukehacker

Conflicts:
	app/controllers/sms_controller.rb
Merge branch 'master' of https://github.com/sahiltrikha/jukehacker
queue method in sms controller
Merge branch 'master' of https://github.com/sahiltrikha/jukehacker
Merge branch 'master' into twilio
commit
Merge pull request #38 from mwagner19446/HelperTests

Update Seed File
Merge branch 'master' of https://github.com/sahiltrikha/jukehacker
Merge branch 'master' into twilio
fixed sms controller
Merge pull request #39 from mwagner19446/HelperTests

Remove binding.pry :(
commit
fix sms controller again
fixed return queue i hope
commit
Merge branch 'master' of https://github.com/sahiltrikha/jukehacker
commit
Merge pull request #41 from itorres1/master

change sms controller
reordering songs by total votes