merged
Merge branch 'master' of https://github.com/arikfe/236369Project.git
Event is rest-
transfer to rest completed