August Sprint - Resolved Merge Conflicts

[wwelling]

• 371 :white_check_mark:

• 369 :white_check_mark:

• 367 :white_check_mark:

• 366 :white_check_mark:

• 365 :white_check_mark:

• 364 :white_check_mark:

• 361 :white_check_mark:

• 359 :white_check_mark:

• 357 :white_check_mark:

• 356 :white_check_mark:

• 354 :white_check_mark:

• 352 :white_check_mark:

• 351 :white_check_mark:

• 350 :white_check_mark:

• 348 :white_check_mark:

• 347 :white_check_mark:

• 344 :white_check_mark:

• 342 :white_check_mark:

• 341 :white_check_mark:

• 340 :white_check_mark:

• 339 :white_check_mark:

• 338 :white_check_mark:

The sprint branch was unintentionally created from a local tamu-main behind origin.