Changed how to get username from user. Changed makefile