Add a StaticPages controller
merging after update to other working machine
merging static and master branches