Merge branch 'master' into information
Merge branch 'master' into information
homepage stuff still in progress
Merge branch 'master' into homepage
added padding to body top and bottom so page content isn't hidden by fixed navigation
Merge pull request #44 from lukemesiti/homepage

fixed navigation from hiding page content
Merge pull request #46 from lukemesiti/information

no changes dude! I think I've already merged them from before...
Merge pull request #45 from lukemesiti/search

let's hope it works. I wanna search.
fixed login problem