merge commit
i hope this merge finally works
wrote third test - know when a number is divisible by both five and three