syncing with Anders
Merge branch 'master' of https://github.com/JoshuaDickerson/cs205-Final_Project
Merge branch 'master' of https://github.com/JoshuaDickerson/cs205-Final_Project
added working jar to server
Merge branch 'master' of https://github.com/JoshuaDickerson/cs205-Final_Project