all local changes live
Merge pull request #13 from niquecoryell/master

all local changes live