First commit for cap
MyRepo
FIxed conflict in gitigore