silshack/spring2014 — pull request #121 by eah13 (2014-01-19 23:54:57+00:00)
Title: Merging

This is a branch off of #119 so merge that first.

No rush on merging this, and the post itself is still a draft. Just wanted to get this out there a little ahead of time..