some changes and adaptions
some extra changes after restarting the terminal
start with making a conflict
create conflict in atom -- master branch
now I made some changes online
second go at online changes
third go
first change Jan
second set of changes by fv.
Changes in fork jan
changes in fork by FV