Fixed superuser creation from command line. The new email is team5@team5.com and the password is team5. No need to use my email address anymore
Resolving conflict with pulling the database
Part two of merging Thursday's demo into the master branch.

Conflicts:
	Pazzos/db.sqlite3
[Issue 9] Tests now recognized in admin

The admins of the site are now able to view, create, edit, and delete tests. The test model will perform error checking on the total list of words and the list of words spelled correctly.

 TODO: Change the default widget being used by the correct/total word lists. Something that will just list the word and provide a button to add a new word to the list would be better than the small select box which shows a couple word at a time and requires the admin to scroll.
Adding the base template file as well as a very simplistic implementation that should be changed to suit our needs. This commit just ensures that we have a file to edit
Merge branch 'master' of https://github.com/ochagata/CSC394Team5 into baseo

Conflicts:
	.idea/workspace.xml
	Pazzos/ARK/__pycache__/admin.cpython-34.pyc
	Pazzos/ARK/__pycache__/models.cpython-34.pyc
	Pazzos/ARK/__pycache__/urls.cpython-34.pyc
	Pazzos/db.sqlite3
Down with binaries
Migrating local DB to new schema. Eventually, we should keep a separate version of the DB for the repo as well as our local machines so we don't always get merge conflicts when trying to pull from remote