Initial commit
tests done no solution
new labs
corrected paths
Merge branch 'master' of github.com:opheliasdaisies/conditionals

Conflicts:
	README.md