Changed naming scheme for member variables, added makefile, implemented setters and getters