Removed mmps.s from git tracking
Removed message
Merge remote-tracking branch 'origin'
fixed a dumb mistake in my code
Merge branch 'master' of https://github.com/hpsin/EECS314