Merge pull request #14 from zoidbergwill/develop

Made changes suggested by @NinaS
Updated Registration Form
Updated Registration Form
Revert "Updated Registration Form"

This reverts commit 48197007553c0a92442c87e86b8c79a87eded71d.
a
Updated Registration Form

Added jQUery Validation Form
Updated Registration Page
Merge branch 'develop' of https://github.com/Umonya/DjangoWebsite into develop

Conflicts:
	umonya/DB_README.txt
	umonya/umonya/apps/main/fixtures/main.json
	umonya/umonya/apps/main/models.py
	umonya/umonya/apps/main/tests.py
	umonya/umonya/apps/main/views.py
	umonya/umonya/templates/base.html
Created Registration Form

Created Dynamic Registration Form
Revert "Created Registration Form"

This reverts commit fb83a7f746956ca1f8ae4ddf5f0124c6929d8384.
Created Registration Form
Made a User Friendly redirect Page
Commiting gitignore
Merge pull request #17 from zoidbergwill/develop

FB and G+ widgets added
Some minor fix ups on style
Reverting To Earlier Commit
Reverted Commit and Created Registration Form

Reverted Commit.
Made Registration form dynamic.
Added Javascript validation to registration form
Put unittests into separate files.
Merge branch 'develop' of https://github.com/gitumarkk/DjangoWebsite into develop

Conflicts:
	umonya/umonya/apps/main/fixtures/main.json
	umonya/umonya/apps/main/tests.py
	umonya/umonya/apps/main/tests/tests_email.py
	umonya/umonya/templates/home.html
	umonya/umonya/templates/registration.html
Created Registration Form and added jquery validation
Deleting DB from version control
Merge branch 'develop' of https://github.com/Umonya/DjangoWebsite into develop

Conflicts:
	umonya/umonya/apps/main/fixtures/main.json
	umonya/umonya/apps/main/models.py
	umonya/umonya/apps/main/views.py
	umonya/umonya/templates/base.html