First commit of project X.
Merge branch 'master' of github.com:ashishb/samsung_hackathon