closed div
fix conflict
auto changes from webstorm
fix conflict
fixing merge issues
Merge pull request #2 from natalie03/master

idk