Added timeline points
Merge pull request #22 from PSU-Capstone-2014-B/robsbranch

Looks good, pushing to master