remove conflict text
Merge branch 'master' into dev_ed
fixed bottom section styles
Merge pull request #72 from ed-fast/dev_ed

Dev ed