f
Merge branch 'master' of github.com:indrekilves/tw-challenge-2014

Conflicts:
	.idea/workspace.xml