resolved merge conflicts
Merge branch 'master' of github.com:srmanikandasriram/babu-bhajji-kadai

Conflicts:
	Auto_Delta/Auto_Delta.ino