Committing all the changes we made as a team Saturday, 11/9.
Merge branch 'master' of https://github.com/ParaSwarm/ALPACA.git