Moved Filewatcher, used timer
Merge branch 'master' of https://github.com/Crumbtray/ECE-421-Assignment2