more docs
Merge branch 'master' of https://github.com/lizzb/Safe-Sex-Attitudes-and-Behaviors_eecs372_spring13

Conflicts:
	.DS_Store