wrapped code in pre tags and switched to inconsolata font
merge master