update
Merge branch 'master' of https://github.com/mdaymond/cici

Conflicts:
	cici/Constants.swift