Just some changes to some files...
Merge branch 'master' of https://github.com/theedudekgroup/SimCha