Merge pull request #6 from mcifelli/master

pull
Merge pull request #5 from CS320/master

Pull Request