commit before merge
commit after merge
added git ignore