created a backup, updated info
This is a git commit message, use it to briefly explain what you just changed and why
Merge branch 'master' of github.com:bsucsclub/website