pull request remake
remove  doubled floppy definition
Merge pull request #13 from Luniak/cc_new

Computercraft recipes from @Luniak
Added vanila items:

redstone lamp, redstone repeater, block of gold, note block
Immibis's Peripherals
Merge pull request #14 from Luniak/cc_ip

Immibis' Peripherals for CC
lan-wire numbers fix
Merge pull request #15 from Luniak/cc_ip

lan-wire numbers fix
README
Merge branch 'master' of github.com:k3rni/mctechtree
renamed disk drive and monitor to not clash with rp2
fixed some errors
fixed dashes in shape causing errors
Allow multiple keys in template crafts, allow not using them in name.
Merge branch 'master' into sinatra
New cluster names
Merge branch 'sinatra' of github.com:k3rni/mctechtree into sinatra