add gitignore
test
asdf
Merge branch 'colin' of github.com:tmccoy/sad

Conflicts:
	wsgi.pyc
asd
Merge https://github.com/tmccoy/sad into colin
changes to index.html and indexstyle.css