Merge pull request #51 from bboland4/master

added my account page, updated edit view and template to display the image, updated index to display myaccount link instead of edit account
Update views.py

Modifications to the edit view:
- It's now okay if the user submits the edit form with no picture selected. The edit view will try to fetch the picture, if it fails, img2 will be set to None and the picture for the blackmail object will not be changed.
Update secretsforms.py

Change made to createEditForm:
It's now okay if the user does not change the image.
Merge pull request #52 from CKnotts/patch-31

Update views.py
Merge pull request #53 from CKnotts/patch-32

Update secretsforms.py
Update views.py

Added a name field in the create form, so the following change in the create view was made:
- If the target does not have an account, the name field will be evaluated. If the name field is blank, 'TARGET' will be the user's name, else the target's name will be whatever the blackmailer specified.

Edited createUserAccount:
- Since the target receives an email with their name and password, and the target's name is no longer always set to 'TARGET', I removed the block beginning the name == 'TARGET' condition.
Update secretsforms.py

Added a name field to the create form.
Update create.html

Added a name field.
Merge pull request #55 from CKnotts/patch-35

Update views.py
Merge pull request #56 from CKnotts/patch-36

Update secretsforms.py
Merge pull request #57 from CKnotts/patch-37

Update create.html
Update views.py

Added a delete option to the edit view.
Update edit.html

- Added a name to the existing submit button.
- Added a new submit button for the delete blackmail option.
Merge pull request #58 from CKnotts/patch-38

Update views.py
Merge pull request #59 from CKnotts/patch-39

Update edit.html
Merge pull request #10 from schleppington/master

update
some style changes

Added Richard's index.html, changed some padding, moved the nav bar down
and added a catch phrase when not logged in, then "Start Blackmailing
USERNAME" when logged in
Merge pull request #60 from eddiebezalel/master

style updates
fixed the delete function (you should be able to delete an BM at any time), updated index view to output the dont display list, populated the site with some actual pictures for our pressentation