Merge pull request #1 from aesphere/master

PENIS
added breadwalk
fixed conflict
ben J's final commit
Merge pull request #6 from benthejack/master

penis #2