checkout from master
Merge branch 'christoffer' of https://github.com/oldgeezr/computer_design into christoffer