new
Merge branch 'master' of github.com:oditszapc/Test2012

Conflicts:
	.gitignore