Server error 500 - bad default.settings.php?
Resolved merge conflict.
Merge pull request #5 from jordanlgraham/feb23_1

Feb23 1