Merging back into main repo

Added spinning wheel and validation for form