After merge, my local files are stashed. Hoping to merge successfully
Fixed bug with classpath. Added a active games view.
Merge branch 'dev' of github.com:cs3733bdt/wpi-suite into dev