sda
Merge branch 'master' of https://github.com/Looc/ChessNow

Conflicts:
	ChessNow/ChessNow.xcodeproj/project.pbxproj
	ChessNow/ChessNow/ViewController.swift