added content to home and about page
fixed conflicts for merge
Merge branch 'dev' of https://github.com/CarterNelms/study-buddy into dev

Merging remote dev into local dev.
fixed issue with image on homepage
Merge branch 'visitor' into dev

merging work complete on visitor branch into dev
fixed issue to all pull of remote dev
fixed typo on app.less page
Merge branch 'visitor' into dev
fixed issue in CSS that prevented css file from loading in browswer