Merge branch 'dev' of UBB/sort into master

.gitignore

@@ -1,6 +1,6 @@
-out
-objs
 doc/Informe.pdf
 doc/*.aux
 doc/*.log
 doc/*.synctex.gz
+*.o
+sort

Makefile

@@ -0,0 +1,15 @@
+CC=gcc
+CFLAGS=-Wall -Werror
+CPPFLAGS+=-Isrc/include
+#LDFLAGS=-lm
+ODIR=obj
+SRC=src/sort.c
+OBJ=$(SRC:.c=.o)
+
+sort: $(OBJ)
+	$(CC) -o $@ $^ $(LDFLAGS)
+
+clean:
+	rm -f src/*.o sort
+
+.PHONY: sort clean