Added new_feature branch
test add
added stuff to new_features branch
fixed merge conflicts