"Local commit...some attempted graph calls?"
Merge branch 'master' of github.com:aaronlindsey/aggie-harmony

Conflicts:
	main.py
Getting/displaying some basic friend info from API. Ugly; will try to implement clean, collapsable panel to display info soon