jenniferpresto/githubPotluck — pull request #2 by jenniferpresto (2012-10-11 22:27:23+00:00)
Title: Merging back to main brach

Merging back to main branch, incorporates Noa's changes.