Customizing
Merge branches 'master' and 'master' of github.com:sorenu/ShapeCockpit

# By Jonas Lysgaard-Hansen
# Via Jonas Lysgaard-Hansen
* 'master' of github.com:sorenu/ShapeCockpit:
  Added a line graph
  Added external display manager

# By Jonas Lysgaard-Hansen
# Via Jonas Lysgaard-Hansen
* 'master' of github.com:sorenu/ShapeCockpit:
  Added a line graph
  Added external display manager

Conflicts:
	ShapeCockpit/ShapeCockpit.xcodeproj/project.pbxproj
Good stuff!