Merge branch '1.0'
Removed comments
Merge branch 'master' of https://github.com/madeleneallvin/ECA-Fortitude