Adding Template and new downloader
...
Merge branch 'master' of https://github.com/rob-med/Elaborato

Conflicts:
	src/download/Downloader.java
	src/main/Main.java