initial commit
Merge pull request #1 from gingerrific/groupwork

initial commit
Merge remote-tracking branch 'origin' into lance