Added club and field of study templates.
Resolved merge conflicts