user.html.erb layout as showcase
Merge remote-tracking branch 'upstream/master'
test
Merge pull request #3 from newohybat/master

dummy změna