Rob's commit
Merge pull request #335 from karma-exchange-org/b1

Rob's commit
Update TEAM-CONTRIB.md
Rob's first conflicting change test
Merge pull request #336 from karma-exchange-org/b2

Rob's first conflicting change test
Merge branch 'master' into amir-rob-conflict

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

Resolving tutorial conflict.