My commit
Modify bar in some manner
Merge pull request #1 from dwgill/conroy

Merge Conroy Branch