initial commit
took green color out of footer
changed css again
committing something
Merge branch 'first'

Conflicts:
	taxiblog/settings.pyc

added .pyc file...trying to fix conflict
laksjdf
Merge branch 'master' of https://github.com/fromageball/whometaxi

trying to get updated after settings.py was removed:wq
Lines starting with '#' will be ignored, and an empty message aborts
adding settings back for now