Fixing jQuery conflicts
Merge remote-tracking branch 'joesweet/master'
Updating and fixing conflicts
merging in joe's additions
Fixing a glitch and adding an add view.
Merge pull request #11 from nickburns2006/master

Fixing an error and adding the beginnings of an 'add' view. Need to remove the gunicorn work.