bla# Please enter the commit message for your changes. Lines starting
trafopop update
Merge branch 'master' of github.com:plusea/CODE

Conflicts:
	.DS_Store
	PROJECT CODE/.DS_Store
trafopop code for ride