make string comparision safer: move string literals to the left when calling .equals()
Merge branch 'master' of ssh://github.com/PennStateCPR/os_cpr