clean up
Merge branch 'master' of github.com:vskarich/tutoring_site

Conflicts:
	media/documents/equality.jpg
	media/documents/flowbee_1_1.jpg