changed main.c
changed main.c
deleted own customization of main.c as it already exists in main
added Makefile
merged
changed dir names