implemented nlp parsing and angular and ability to add to subcluster
Fixed merge conflict in cluster_test