Pushing a few updates and building out the encounter object.
Merge branch 'feature/Initiative' of https://github.com/isnotnil/complex_action_ios into feature/Initiative

Conflicts:
	ComplexAction/SharedEntities/Player.swift
Merge branch 'feature/Initiative' of https://github.com/isnotnil/complex_action_ios into feature/Initiative