Trigger wrap up
Merge branch 'master' of https://github.com/tangcongyuan/WPI_CS542_rms