Merge

first time merge with vivek
Reverting to the state of the project at d1bde1b
Merge pull request #3 from githubosu/master

Merge