Merge pull request #1 from isaacdontjelindell/master

initial