pre merge commit. Add what's been being worked on
Merge branch 'dev' of github.com:LSUCS/LAN-Website into dev
Merge branch 'master' into dev
Add start of announcements, and hopefully all of free ticket claiming
Fix merge conflicts