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
Merge branch 'master' of https://github.com/sahiltrikha/jukehacker
Merge branch 'master' of https://github.com/sahiltrikha/jukehacker
Merge branch 'master' of https://github.com/sahiltrikha/jukehacker