versioning:automatic-merge-failed.git
2015-02-19 Femke Sneltingadding difference.sh for demo purposes master
2013-10-20 FSfirst README
2013-10-20 FSautomated version, promiscuous slideware
2013-09-16 FSInitial commit!