more refactor
more refactor
one university data
add todo tag
Merge branch 'local-run'

Conflicts:
	src/main/scala/Exercise.scala