just learning the github app
test commit
test2
Merge branch 'master' of https://github.com/davidwhogg/KinematicConsensus

Conflicts:
	py/kincon.py
test3
test4