BuckeyeCurrent/Simba — pull request #58 by sharrington93 (2014-07-18 05:55:26+00:00)
Title: Poor GitHub merge fix

Fixed a pretty bad merge done by GitHub by merging two pull requests back to back. Second pull request completely overwrote all changes made by pull request one without merging