Added Class3
Merge origin/master