Initial commit.
Added another ordinary controller action.
Resolved conflict on gitignore