Initial commit
Add a StaticPages controller
Initialize repository
Improve the README
Resolve conflicts