started converting to amd
merged the two code bases
fixed merge conflicts
fixed moar conflicts
Merge pull request #1 from Adalden/dallin-convert

Dallin convert