Cleaned up formatting a little
Minor update to template format, adding basic concepts section
merge