Final commit before turning everything over to Chris
Merge branch 'master' of https://github.com/UFRA-UVU/WebDev