Updated Makefile
Gitignore, overall code revamp