ref: 7c9f98141db66a18b6fb50e1c7d330d45e4f01bf
parent: eedf04c24359128f9a6a455ba66847574226a4a7
parent: d6bbdee236d4bc3da742347c9fb7410870ea1d23
author: U-Daniel-Laptop\Daniel <corrnondacqb@yahoo.com>
date: Mon Dec 23 04:35:15 EST 2013
Merge branch 'music' of https://github.com/dannye/pokered Conflicts: main.asm