Got Terrplant QA/QC page working
Merge branch 'chance' into sprint5
Merge branch 'jon' into sprint5