init brian branch
committing joe's changes
added barend pics, edited barend page
testing 1, 2, 3
No pizza
Merge branch 'Joe'

Conflicts:
	Scripts/python.exe
	app/__init__.pyc
	app/views.pyc
	config.pyc