Merge branch 'master' of /Users/willmerlopez/Documents/GitHub/capstone/pro-e-systems with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Fixed visual problems in editConnections
Fixed visual problems in editConnections and added the js to dynamically populate the addmaterial list and the editconncetions list.