Beta maaaal
Merge branch 'master' of github.com:Sebabm/avatask

Conflicts:
	.gitignore