added shiat
Merge branch 'master'
reservering klasse updates
Merge branch 'Jin'