Merge branch 'feature/random_cin'
Merge branch 'dev'
mv test.rb cin.rb
count up
add 14 to output.txt

Conflicts:
	repo1/src/output.txt
change dir level
Merge branch 'feature/count' into dev

Conflicts:
	src/test.rb
Merge branch 'research/branch' into dev

Conflicts:
	repo1/src/output.txt