first commit
Merge https://github.com/kjowens/LifeCon