commiting local changes
removed a stray print statement, added a make file and corrected some spelling errors
stupid grammar and formatting changes that I am required to make because of OCD
fixing merge problems