merge fix
removed list styling
fixing styling
fixed overlay issue
fixed heroku error
fixed merge
fix merge issues
Merge pull request #48 from RKim220/ryan

Ryan