Added auto-intendation to Makefile.
Merged stuff. Hopefully everything works now...
Fixed intendation and .gitignore