commiting to all branches
Merge pull request #1 from justingreco/master

commiting to all branches