edits
Merge branch 'master' of http://github.com/jbenzshawel/image.gallery