Initial commit: created first files
Fixed merge conflic
Added get method