Added make file

Just merge my changes and type make!