fixes main example classes
Merge
Adds master files