register bootstrap
fixing merge conflicts
Merge pull request #27 from Fitzclutchington/master

register bootstrap