kaitlynn test commit on new branch to pull in new master updates and test process
updating minor test changesbefore master fetch
fix pull conflict on client/fullSpot.html