testing 1, 2, 3
No pizza
trying to merge master and joe
Merge branch 'Joe'

Conflicts:
	Scripts/python.exe
	app/__init__.pyc
	app/views.pyc
	config.pyc
Brian's about is filled out, lots of work on home page, added dorky logo as a place holder.
same as last comment, I just forgot to stage all the files lol.
changed color of font.
Merge remote-tracking branch 'SchSpec/brian'

Conflicts:
	app/templates/about.html
Dl4 stuff
Joe's first push to server
Dl4 editing
removed binary files
Merge branch 'master' of https://github.com/schoolie/SchSpec
fixed case in image files
readded dl4 pics