our changes
Merge pull request #1 from hanskoff/wtorek-mvc

our changes