course info stuff
merging
fixing conflicts