Test
A little pull request error handling
Get a little smarter with rebase error handling
Merge pull request #6 from iancmcc/feature/hi

Please review branch feature/hi