initial
README
README
renamed directories and fixed
this is committed.
Sam changed some stuff
updating Collette_tests
Merge branch 'master' of bitbucket.org:swinstanley/forgetdata_tests
sdfdsf
Merge branch 'master' of https://github.com/swinstanley/fdgithubtest.git

Conflicts:
	.gitignore