Alvin
Merge branch 'master' of https://github.com/stuyfission/kiwi
Merge pull request #2 from omgimanerd/master

THis pull request adds stuff