Added user photo, watermark and fixed some stuff
Merge pull request #38 from SyntaxError2014/nbi

Added user photo, watermark and fixed some stuff