fixing style bugs
some styles
merged conflicts
Merge pull request #48 from ed-fast/dev_ed

Dev ed