gems
Merge branch 'master' of github.com:asif-meer/sms

Conflicts:
	Gemfile
	Gemfile.lock
	log/development.log