Fixed errors in Makefile from the master branch; added Timer.h and cp.cpp to the ls branch from master
Merge branch 'ls' of https://github.com/jstod001/rshell into ls