Convert all times to seconds, need to pass to timer
Merge branch 'master' of github.com:dsharps/pennapps2013f