new metrics
Merge branch 'master' of https://github.com/11791-03/project-team03

Conflicts:
	src/main/java/edu/cmu/lti/f14/project/util/Stats.java