Some corrections
Merge branch 'master' of https://github.com/someshk/samsung-chord-hackathon
Minor changes
Removed unused file