added other stuff
yep
Merge pull request #4 from perrylot/branch-b

Branch b