Fix for new swfit language
Merge branch 'master' of github.com:kevinzhow/PNChart-Swift

Conflicts:
	.DS_Store
	PNChart-Swift/MasterViewController.swift
	PNChart-Swift/PNChart/PNBarChart/PNBarChart.swift
Merge branch 'master' of https://github.com/kevinzhow/PNChart-Swift