Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   docs/systemRequirements.tex
Merge ssh://github.com/boogleoodle/trafficometer

Conflicts:
	docs/systemRequirements.tex

Trying to resolve conflicts...
Merge ssh://github.com/boogleoodle/trafficometer
 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   docs/krav/definitions.scala
	modified:   docs/krav/definitions.tex