To avoid name collisions
To avoid name collisions
Merge branch 'master' of github.com:bwiedermann/scala-labs

* 'master' of github.com:bwiedermann/scala-labs:
  To avoid name collisions
Merge branch 'master' of https://github.com/hmc-cs111-fall2014/scala-labs

* 'master' of https://github.com/hmc-cs111-fall2014/scala-labs:
  Swapping order to tests to match code in lab files.
Working on lab 1
Working on OO, Exercise 1
To avoid name collisions
Working on lab 1
Working on OO, Exercise 1
Merge branch 'master' of github.com:bwiedermann/scala-labs

* 'master' of github.com:bwiedermann/scala-labs:
  Working on OO, Exercise 1
  Working on lab 1
  To avoid name collisions
  To avoid name collisions
Working on Exercise 3.
To avoid name collisions
Working on lab 1
Working on OO, Exercise 1
Working on Exercise 3.
Merge branch 'master' of github.com:bwiedermann/scala-labs

* 'master' of github.com:bwiedermann/scala-labs:
  Working on Exercise 3.
  Working on OO, Exercise 1
  Working on lab 1
  To avoid name collisions
  Working on OO, Exercise 1
  Working on lab 1
  To avoid name collisions
  To avoid name collisions
To avoid name collisions
Working on lab 1
Working on OO, Exercise 1
Working on Exercise 3.