Merge pull request #2 from Kevinljh/kevin

update
Merge pull request #3 from Kevinljh/kevin

updates
session variables

setup timer and other stuff
Merge pull request #4 from Kevinljh/Michael

session variables
few little changes not much
Merge pull request #5 from Kevinljh/michael

few little changes not much
update