user action log added
mergeeeee!

Merge branch 'master' of github.com:watermelon91/eecs584f14