Merge pull request #1 from GCStokum/master

Working Laptop pull post v0.1
Merge pull request #2 from GCStokum/WorkingLaptop

Merge pull request #1 from GCStokum/master