first commit
Merge pull request #1 from zgolman/raj

first commit
Resolved merge conflict or did I?