testing
Merge pull request #1 from halfg33k/AdamDev

testing