Added timer and window implementation
Merge branch 'master' of https://github.com/evshi/CS-118-Project-2