merging my changes
merging my changes
Merge branch 'master' of https://github.com/mymichellle/TT
 my changes
my changes
my changes
removed all merge conflicts
fixed boolean definition issue