Updated with latest code (not code from early spring...)
Updated ignore file
Added class diagram