Renamed
Updated the make file
Updated the code to handle both built-in server and Gunicorn