did a whole lot of documentation stuff
Merge remote-tracking branch 'origin/bullets'