christopher-meyer/swhrs-server — pull request #4 by christopher-meyer (2012-09-18 10:38:51+00:00)
Title: A little conflict that was created by myself and not pulling from master before slave tried to push to master.

Set of commits that increases functionality and readability.