This is an addition...
A new push
Merge branch 'master' of https://github.com/byeah/tElevator.git

Conflicts:
	src/main/scala/Hello/add.scala