update header
merge
move git ignore
tryingtomerge
merge