Add a StaticPages controller
Try to get tests to pass
Merge master