ref: 4e530306781ccebf483dd86c39bd53bd4ca97fbd
parent: 321e432e078d6eceeb25843341d0078214a58394
parent: 515357a4504aa8c0816f088054c26f1902e71e72
author: U-Fish-PC\Daniel <corrnondacqb@yahoo.com>
date: Tue Dec 10 09:08:08 EST 2013
Merge branch 'master' of https://github.com/iimarckus/pokered Conflicts: main.asm