Added text on top of renamed file
Merge commit '536c4f823b298fd8d2fe853b6a27b5c5fde58c4f'
Added studf
Fixed merge confilic