commit of nothing. I'm trying to pull from remote
Merge remote-tracking branch 'upstream/master'
fake commit
Merge remote-tracking branch 'upstream/master'
Added getAllPropertiesAndTypes, parseString:stringToParse, isObject:
Refactoring since we're not longer counting for primatives
Fixed Spacing
Add changes.
Fix merge conflicts.