Now the Interface is more fitting to our current Interface and unncessary code is removed
Now the Interface is more fitting to our current Interface and unncessary code is removed

ohaz/amos-ss15-proj1,ohaz/amos-ss15-proj1,ohaz/amos-ss15-proj1,ohaz/amos-ss15-proj1,ohaz/amos-ss15-proj1,ohaz/amos-ss15-proj1,ohaz/amos-ss15-proj1,ohaz/amos-ss15-proj1