Merge pull request #1 from Nolan E

Merging our group