changes to Timer
Merge remote-tracking branch 'origin/master'

Conflicts:
	CS 2420 - Summer 2014/src/assignment4/RecursiveSortingTimer.java
changes to Timer