my first commit
Merge branch 'master' of https://github.com/antstamper/adam

My first message.