changes
fixed merge conflict
minor changes
fixed conflicts
fixed merges conflcit
fixed merge conflicts
added example that covers first couple chapters of Scott Muarry D3
merged changes