commit
Merge branch 'master' of https://github.com/wesleysui/MarketManager

Conflicts:
	MarketManager/HistoryListViewController.swift
commit