Merge remote-tracking branch 'origin/jamcraft'
Commit

Organized code. Working on adding infusion and crap.
Merge remote-tracking branch 'origin/master' into jamcraft