10.4.2013
Merge branch 'master' of github.com:lubosch/final

Conflicts:
	.gitignore