Test commit for conflict merging tutorial
Merge branch 'master' into amir-rob-conflict

Conflicts:
	src/main/webapp/css/main.css

Resolving tutorial conflict.
Merge pull request #337 from karma-exchange-org/amir-rob-conflict

Test commit for conflict merging tutorial