Wrote the search() function
Modified search() to use jsonp requesting due to cross-domain issues.
Also added a small block that will prevent the form from refreshing the
page.
Added test.html, which is just a dummy html file for testing purposes.
Wrote the view, added the url, and wrote the template.
modified templates and views and added requirements
working skeleton of introproject
Merge branch 'django_template' of github.com:The-Blue-Football-Dogs-From-Tokyo/IntroProject into django_template
added logging functionality:
Merge branch 'django_template' of github.com:The-Blue-Football-Dogs-From-Tokyo/IntroProject into django_template
fixed a bug with the views (error when user didn't enter anything)
Previous fix didn't fix. This is actual fix.
switched to using django-bootstrap3
Empty test log file
Merge branch 'django_template' of github.com:The-Blue-Football-Dogs-From-Tokyo/IntroProject into django_template
Added lettuce to requirements. Don't forget to pip install -r
requirements.txt
added lettuce
Merge branch 'django_template' of github.com:The-Blue-Football-Dogs-From-Tokyo/IntroProject into django_template
set up tox and nose for testing purposes
set up xcoverage and added 2 tests for webpage
added bootstrap to the template
Merge branch 'django_template' of github.com:The-Blue-Football-Dogs-From-Tokyo/IntroProject into django_template

Conflicts:
	introproject/settings.py
	logfile