Styling and some form edits and testing alterations
resolved conflicts on styling branch and made some minor changes
once again resolving branch conflict
had to comment out user#update test to pass
Merge pull request #31 from kexline4710/styling_branch

Styling branch