fixed typos in Makefile, renamed usingController() to setUsingController()
fixed conflict (see note about fast-forward in git push --help)