group image
Merge branch 'master' into dev_ed
just images
some styles
merge conflicts
Merge branch 'master' into dev_ed
Merge pull request #69 from ed-fast/dev_ed

Dev ed