Shawn's updates -Timeline, testing
Merge branch 'master' of github.com:gajjanag/6111_Project