Merged into develop

Created by: evranch

Learned a bit more about Git today. Managed to lose all my local commits, despite backing up the directory? Luckily I could pull them back down from my Github account... yikes. Still not sure what went wrong.

Still trying to figure out how to use Git properly, obviously.

Looks like I should fetch "upstream/develop", then branch with a name that suits the work. Make some commits. Rebase -i to clean up the tree to a single commit per issue. Then fetch upstream/develop again to make sure it's synchronized. Pull "upstream/develop" into "develop", merge working branch into develop, push to evranch/develop, send a pull request.

It also looks like I could have solved this particular issue by choosing the base branch in github for the pull request to "develop" However then I wouldn't have learned more about branches, HEAD, rebasing and such.

Looks like your commit on README.md got merged in there too as this was originally branched from "master" and it's kind of stuck in there now. Hope that doesn't cause any issues.

I found that I could add a lamb fine despite not having any breeding records (Being commercial, our breeding records consist of "Date rams in" and that's about it) after changing the line where a null is cast to int. I'm not sure what java is expected to do in that case, but it threw NullPointerException on my devices, so I changed it to something a little more conventional.