Merge pull request #1 from schleppington/master

hey
Merge pull request #2 from schleppington/master

update
Merge pull request #3 from schleppington/master

update
Merge pull request #4 from schleppington/master

update
Merge pull request #5 from schleppington/master

update
Merge pull request #6 from schleppington/master

update
Merge pull request #7 from schleppington/master

update
Merge pull request #45 from bboland4/master

added editaccount view and template
Merge pull request #46 from bboland4/master

updated editaccount so that you dont have to change your pw to update email and name
Merge pull request #47 from bboland4/master

minor update: updated templates for better readability
Merge pull request #8 from schleppington/master

update
Update views.py

Added many comments in the edit view. Also added None types term1, term2, term3--if a 2nd or 3rd term was not stored in the database already and the user updated the terms list to include additional terms, an error would occur due to term2 and/or term3 not being created.
Merge pull request #48 from CKnotts/patch-29

Update views.py
Merge pull request #9 from schleppington/master

update
styling changes

updating some of the styles to make the site look better
Merge pull request #49 from eddiebezalel/master

style updates
Update views.py

Edit fields are now populated with all current info except the picture.
NOTE: there IS a bug here--if you don't choose a picture, it won't recognize the form as valid. To test the edit function for the rest of the fields, choose a picture or your other data won't ever be evaluated.
Merge pull request #50 from CKnotts/patch-30

Update views.py
added My Account page, updated index menu links, updated edit page to use base template and display the image