update for conflict
Merge branch 'master' of github.com:adityamr15/jdw_sms_bk

Conflicts:
	index.html