Adding connectors between components.
Part of Jira issue:http://tintin.cs.indiana.edu:8091/browse/PSU-21
Resolving conflicts and merging.
Part of the Jira issue:http://tintin.cs.indiana.edu:8091/browse/PSU-21