Testing merging

Please merge this :)
Hmm do inline pics work. I need them in my life...