Commit from meeting

commited changes from meeting on monday, april 8th.