some button and homepage styling
resolved merge conflicts
resolved conflicts
emptied database, made a few changes