Change the same line of code
Merge branch 'master' of https://github.com/vegiecat/Project8

Conflicts:
	Project8/AppDelegate.swift