fixed errors after merge
add info about how to create the makefiles