Merge pull request #1 from lapty/master

init commit -added badassphoto
commit
test
Merge pull request #2 from crotten/master

Test
merged...i think