Finished competitive section + other amendments

Main Team section;
Merged Tryouts and Commitment into one, commented out;
Changed FAQ headings;
Amended Casual Ballroom section;
Amended Salsa section;
Amended Salsa subsection in Learn to Dance section.
merge conflict
new uncompressed version
Merge branch 'master' into gh-pages
fixed competitive section