dashboard
Merge branch 'master' into dashboardBranch

Conflicts:
	Petsies.xcodeproj/project.pbxproj
parse framework
supporting all three comptuers
Merge pull request #8 from yoonsw15/dashboardBranch

dashboard