Add a StaticPages controller
add a full_title helper
README conflict