adding a StaticPages controller
merging branches