Fixed match time labels, added tests for match times and viper team saving
Merge pull request #20 from K4orta/event-timing

Fixed match time labels, added tests for match times and viper team savi...
fixed merge conflict

Merge branch 'dev' of github.com:ign/ipl-robocop into dev

* 'dev' of github.com:ign/ipl-robocop:
  Moved some vars out into private config file

Conflicts:
	public/javascripts/app.js
	public/test/javascripts/test.js