Merge pull request #12 from EldonYoder/testing

Testing
updated time and estimate stuff