Merge remote-tracking branch 'origin' into laptop

why dude? stupid git...
took out the save link
Merge pull request #3 from williamtguerra/laptop

Laptop