Gender neutral
Merge branch 'master' of github.com:hmc-cs111-fall2014/scala-labs

* 'master' of github.com:hmc-cs111-fall2014/scala-labs:
  Gender neutral

Conflicts:
	labs/src/main/scala/org/scalalabs/basic/lab02/ListManipulationExercise02.scala
Merge branch 'master' of https://github.com/hmc-cs111-fall2014/scala-labs

* 'master' of https://github.com/hmc-cs111-fall2014/scala-labs:
  Gender neutral