my first file, wtf is going on?
Merge pull request #1 from danc1248/danc

my first file, wtf is going on?