completed ver2 of tip calculator