willz first commit
fixed merge conflicts
started making view
Merge branch 'james'
Merge branch 'james'
changes
wsgi.py
settings.py
ignore list added
added our models and updated the database