striping down
Merging with master
fixing merge
fixing merge of model.py
fixing merge of model.py