I hate these

Merge branch 'master' of git://github.com/williamtguerra/williamtguerra.github.com into laptop
style stuff; menu is broken
Merge pull request #4 from williamtguerra/laptop

Laptop