added timer files and layout changes
Merge branch 'stage2' of https://github.com/Under-Construction/project1 into stage2