added nav bar and snow on home page
fixed nav bar
deleted .orig
merged with soutchay
merge soutchay
Merge branch 'ZAch2' into soutchay
fixed background
fixed merge conflicts
fixed text alignment
fixed css on option page
working on Loginn
yeah
pulling samanthas
added nav bar background
Merge branch 'samantha' into ZAch2
add .env to .gitignore
use unicorn via procfile
deleted dollar gif file