#30 permitted parameters
Merge branch 'develop' of github.com:LYK-Ruby-On-Rails/kozalak into develop