Files after first class
Added new files, from first class
Fix conflict added swig