initiAl commit
Merge branch 'master' of https://github.com/kartikpalani/Smart-Energy-Hackathon