Fixing a conflict
Merge branch 'master' of github.com:cs4540-Seg-Fault/tracker