test strings, initial doc update
Merge remote-tracking branch 'origin/master'
test strings, initial doc test
Merge branch 'master' of /Users/itburnz/Desktop/GIT/angular-tether/src/styles/strings with conflicts.