0.5

half way there?
Merge branch 'master' of https://github.com/evmiyaki/State-App

Conflicts:
states/StateTVC.m
conflict

conflict
what

what