Updated form.
Merge branch 'master' of https://github.com/sjdixon/CPSC471Library