init
Merge branch 'master' of github.com:ajunge/timaukel-antenas

Conflicts:
	.gitignore