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
test to see if this fixes the push problem
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
removing .pyc files
Merge branch 'master' of whometaxi.com:/home/fromageball2/django/taxiblog

Conflicts:
	blog/__init__.pyc
	blog/admin.pyc
	blog/feed.pyc
	blog/models.pyc
	blog/views.pyc
	taxiblog/__init__.pyc
	taxiblog/urls.pyc
	taxiblog/wsgi.pyc

trying to get rid of .pyc files
Merge https://github.com/fromageball/whometaxi

bring up to date...bring back settings.py for now the commit.
deleting .pyc files
Merge branch 'master' of https://github.com/fromageball/whometaxi
Merge branch 'master' of https://github.com/fromageball/whometaxi
Merge branch 'master' of https://github.com/fromageball/whometaxi

trying to be able to push to github the commit.
Merge branch 'master' of https://github.com/fromageball/whometaxi
updated settings and css file for large layout
Merge branch 'settingschanges'
add settings_secret.py to .gitignore