Only an example settings file should be in git.
Added settings file to ignore list
Merge branch 'master' into production
Keep production settings
Began Base html file, added views for categories and category page
Fixed line-endings
Merge branch 'master' into production

Conflicts:
	readmore/settings.py
Removed unnecessary staticfile_dirs
Renamed production settings file
more
Merge branch 'master' of heroku.com:lees-meer into production
Set absolute path to STATIC ROOT