styling to people show and edit
resolved conflicts
styled user edit account page
Merge branch 'development' of github.com:JamesRoyPoulter/project_jac into development
fixing spacing and adding people on people index