Minor changes
Merge branch 'master' of https://github.com/buffaloproject1/BuffaloProjectWebsite

Conflicts:
css/.sass-cache/2ab4b881d9cb25c0910e6e5d35f1c514b0e02c8b/profile.scssc
css/compiled/profile.css
css/sass/profile.scss
scripts/ProfileSideBarScripts.js
Chnage of gitignore
Minor changes
Minor changes