edits
fixed merge conflict
did not modify
fixed merge conflicts
fixed merge conflicts
fixed merge conflict
idk why we keep getting merge conflicts:
IDK
...
Merge branch 'master' of github.com:Eventalist/Eventalist into TimoorKurdi
Added styling
Merge pull request #33 from Eventalist/TimoorKurdi

Timoor kurdi