Environment updates
Merge branch 'master' of https://github.com/Splendorr/S201-Darr-Kajes
Merge branch 'master' into KellyVersion
Merge branch 'KellyVersion'