commiting my branch
resolved conflict
Merge pull request #3 from vivekmshah/paul

commiting my branch
fixed merge conflict with james' pull request