Merge pull request #25 from ph201/first-week-sprint

Pull Request for Coding Changes for our First Week Sprint