Baseline
Merge branch 'master' of github.com:indrekilves/twc_app

Conflicts:
	.gitignore