initial commit
Adds git ignore file
Merge branch 'master' of github.com:gmiller2007/cheddarcode-g

Conflicts:
	blog/templates/base.html
	blog/templates/home.html
	blog/templates/portfolio.html
	blog/templates/resume.html
	blog/templates/sidebar.html
Merge branch 'april2013'

Conflicts:
	.gitignore
Removes settings.py