ugh
Merge branch 'master' of github.com:ear7631/RIT-adhoc
More changes
Merge branch 'master' of github.com:ear7631/RIT-adhoc
Fixed some bugs, I guess. Some tests...