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

Conflicts:
	.idea/workspace.xml
Merge
Merge branch 'master' of https://github.com/indrekilves/tw-challenge-2014
Controller