local changes
Merge branch 'master' of https://github.com/jaakkytt/podcaster.git

Conflicts:
	Podcaster/bin/application/.gitignore
	Podcaster/src/application/Main.java
näide