integrates ilana's inline image styles
fixes merge conflicts
Merge pull request #61 from ilanasufrin/emily

Emily