attempt to compile
after auto-merge-conflicts
Merge branch 'master' of https://github.com/gurusfp/billmac
Attempt to integrate ps/2 kbd