[dec-2014] Computer
Merge pull request #341 from computeranonymous/computersf-2014-12-13

[dec-2014] Computer