basic formatting stuff
resolved conflicts
Merge pull request #18 from grcdeepak1/master

Formatted date :)