commit before pull
fixed merge conflicts
randomizer working and styling started for home page