disable fields
merged
merging
Merge branch 'master' of http://github.com/Ico91/JspBeginnerPractice