Style Completed
Resolved Merge Conflicts
Merge pull request #10 from tracyalison11/master

Style Completed