init
Merge branch 'master' of https://github.com/pahanez/apmediatst

Conflicts:
	.gitignore