commit to pull
Merge branch 'master' of https://github.com/marcdm/juleslist
fixed conflicts

Conflicts:
	src/fetchapi.php
submission folder structure created