Testing commit/merge
Merge pull request #1 from abartolo/Alex_Branch

Testing commit/merge